Fix for bug 1021467, 1020440, 1021041
Merge pull request #3956 from abhgupta/stage_34_2_fixes

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.15.5-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.15.16-1].
Fix for bug 1021462
Bug 1021462 - Pushing user variables failing if haproxy not installed

* Use same ssh settings as haproxy/bin/ssh
  -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=$OPENSHIFT_HOMEDIR/.openshift_ssh/known_hosts
  -F $OPENSHIFT_HOMEDIR/.openshift_ssh/config -i $OPENSHIFT_APP_SSH_KEY
Merge pull request #3974 from abhgupta/stage_fix_1021462

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-controller] release [1.15.17-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.15.12-1].