Merge "Fix up test_volume_actions_rbac"