Comment 4 for bug 1668940

I'm entirely fine with this happening for 17.04, however please do hammer on it a bit in 17.04 (with enough time to revert if we find it's broken, or causes regressions for non-ceph users) before we consider backporting the change as an SRU.