Merge pull request #5933 from jwhonce/stage

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.31.10-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-vhost] release [0.10.5-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.28.4-1].
Automatic commit of package [openshift-origin-node-util] release [1.30.7-1].
remove old upgrade logic
Merge pull request #5934 from derekwaynecarr/stage_fix_5931

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-jenkins] release [1.25.4-1].
Bug 1161263 - Support class method truncate()