<oo-accept-broker> Bug 958437 - Making CONSOLE_SECRET check dependent on existence of CONSOLE_CONF

https://bugzilla.redhat.com/show_bug.cgi?id=958437

Only check CONSOLE_SECRET if the Console config is present on the
system, since there is no dependency on openshift-origin-console being
installed for broker-utils
Merge pull request #2308 from detiber/bz958437

Merged by openshift-bot
Fix for bug 956441
 - increasing mcollective timeout for oo-admin-chk
Merge pull request #2314 from abhgupta/abhgupta-dev

Fix for bug 956441