control-center/serviced — pull request #1134 by iancmcc (2014-10-02 17:00:03+00:00)
Title: Re-do feature/CC-221

Un-reverts control-center/serviced#1132