Merge "Add Gnocchi aggregation and incoming ceph storage"