Merge changes from topic 'cleanup'

* changes:
  CatServlet: constructor adheres to coding style best practices
  Kill ChangeControl.Factory