Merge "port admin/test_servers* into Nova V3 tests part2"