Merge changes from topic "b229228871-cs-interface" into tm-dev

* changes:
  Rename CentralSurfacesInt back to CentralSurfaces.
  Make CentralSurfaces an Interface.