Merge "Revert "Use optimal (instead of default) tunables for Ceph on upgrade""