More command consistency
Fix keep_deployments handling in deploy tests
Merge pull request #3856 from danmcp/master

Merged by openshift-bot
Merge pull request #3858 from ironcladlou/build-deploy

Merged by openshift-bot