Beginning of region/zone support for ceph and also fix some define
conflicts.