Bug 1075673 - Unable to perform git deploy after binary deployment

After doing a successful binary deployment, the node is unable to
process a git deployment
Merge pull request #4943 from bparees/binary_deploy

Merged by openshift-bot
Merge pull request #4947 from danmcp/master

Merged by openshift-bot
Bug 1007830 - Better error handling around quickstarts.json loading