controller dependency fixes
Merge pull request #2099 from brenton/controller1

Merged by openshift-bot