CORE-1544 Explicit rabbitmq start on single controller

This commit explicitly starts rabbitmq when in single controller
mode while removing an excess os-collect-config which may cause
problems with rabbitmq.

Change-Id: I9222c56f5614c22f6093cca2876083358e187e7a