Merge "Don't fail if keystone_policy is not available"