Merge "Image create v1/v2 compatible in compute test_images_rbac"