Merge "port flavors and server_password tests into nova v3 part2"