Deploy fixes

Don't update metadata.json on disk for each attr update

Make all 3 jenkins_shell_command files consistent

Only check for marker files when using git push or jenkins remotedeploy

Support checking for marker files in the correct deployment ref

Bug 1017154
Bug 1013064
Bug 1018009 - spawn a separate thread to waitpid after killing.
Fix deployment test
Merge pull request #3864 from rmillner/BZ1018009

Merged by openshift-bot
Merge pull request #3861 from ncdc/deploy-fixes

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

Merged by openshift-bot