Various dependencies fixes for www-apps/openshift-origin-broker and config files