Getting singleton tests in the right place
Merge pull request #4123 from danmcp/master

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-jbossews] release [1.17.1-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.17.1-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.17.1-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apachedb] release [0.2.2-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-mod-rewrite] release [0.3.1-1].
Automatic commit of package [openshift-origin-cartridge-mysql] release [1.18.1-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.18.1-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [1.17.1-1].
Automatic commit of package [openshift-origin-node-proxy] release [1.16.2-1].
Automatic commit of package [openshift-origin-broker-util] release [1.17.1-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.17.1-1].
Automatic commit of package [rubygem-openshift-origin-frontend-nodejs-websocket] release [0.2.2-1].
Automatic commit of package [openshift-origin-cartridge-postgresql] release [1.17.1-1].
Automatic commit of package [rubygem-openshift-origin-auth-remote-user] release [1.17.1-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.17.1-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [1.17.1-1].
Automatic commit of package [openshift-origin-cartridge-php] release [1.17.1-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-vhost] release [0.2.2-1].