Merge "port nova v2 images related tests into nova v3 part2"