Merge changes Icad6d952,Ic41aa804

* changes:
  Pretty print RegionSpace::RegionType and RegionSpace::RegionState values.
  Stylistic and aesthetic changes.