Bug 1061392 - Can't create Java Application using Tomcat7 with existing
sources

https://bugzilla.redhat.com/show_bug.cgi?id=1061392

If the existing source does not include a populated .openshift/config
directory, deployment will fail.
Bug 1059374 - Sanitize supervisor_bin/node_bin before pkill
Merge pull request #4705 from mfojtik/bugzilla/1059142

Merged by openshift-bot
Merge pull request #4694 from bparees/tomcat_empty_config

Merged by openshift-bot
Bug 888714 - Remove gitkeep files from rpms