reviewed by huie dont translate the title
Merge branch 'develop' of github.com:control-center/serviced into develop