Merge "Remove Cinder policy.json install"