Merge "Use predictable instance/volume names in test_volumes_actions"