Merge "Add default policy for Gnocchi" into release/proposed/2019.2.0