Merge "Fixes test_images_member_rbac missing os credentials for image v2."