Merge "Adjust registration of ami image in boto tests"