Fix kube-deploy issues from upstream rebase
Merge pull request #135 from ncdc/fix-rebase-issues

Merged by openshift-bot