Merge "Remove admin namespace throughout Patrole - Volume tests"