Fix bug 1010464: only use supervisor is hot_deploy is enabled
Merge pull request #4217 from pmorie/bugs/1010464

Merged by openshift-bot