Change controller startup to force o-c-c

Previously a step existed to force the execution of os-collect-config
and then re-run it if necessary. That forced execution was removed
as it would fail when MySQL was not already running.  That being said
the step still needs to be executed. As such, changing the --noforce
step to be a forced execution of os-collect-config.

Change-Id: I3afbccd529c8ff55d4e26d1b99b4ec28f16e8b9c