[TO_STAGE] backport of marek's origin-server/pull/2949
Merge pull request #2964 from maxamillion/dev/maxamillion/stage_marek_acceptnode

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.10.7-1].
Automatic commit of package [openshift-origin-node-util] release [1.10.6-1].
Merge remote-tracking branch 'upstream/stage' into stage

Conflicts:
	node-util/openshift-origin-node-util.spec
	node/rubygem-openshift-origin-node.spec
	rel-eng/packages/openshift-origin-node-util
	rel-eng/packages/rubygem-openshift-origin-node