This improvement is part of a wave of polish
in preparation for the launch of the Ceph product.

Change-Id: Icec5faee1c9e693aa149d571f322e66a0899a14c