Merge "Move tenant usage tests into misc policy actions file"