Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server into misc-dev
Merge branch 'misc-dev'
Merge branch 'master' of github.com:openshift/origin-server
Fix tests to use newer-style rhc invocations

Change to the newer invocation style, order arguments consistently, and
delete global variables with paths to deprecated rhc executables.
Add @not-enterprise tag to some tests

The tests marked are for cartridges that are not in OpenShift Enterprise
at this time: 10gen, MongoDB, NodeJS, and PhpMyAdmin.  Also disabled for
Enterprise are lifecycle tests for the Ruby 1.8 cartridge; these tests
need to be updated.
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Merge pull request #916 from Miciah/devenv-fixes-2

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-jbossews-2.0] release [1.0.6-1].
Merge branch 'master' of github.com:openshift/origin-server

* 'master' of github.com:openshift/origin-server:
  Add @not-enterprise tag to some tests
  Fix tests to use newer-style rhc invocations
Fix failing socket file tests
disable jenkins DNS multicast
increase jenkins creation timeout
Merge pull request #1146 from pmorie/bugs/fix-tests2

Merged by openshift-bot
Merge pull request #1145 from bdecoste/master

Merged by openshift-bot
Merge branch 'master' of github.com:openshift/origin-server
Update UserGuide link to Working With Domains
Switch namespace form to use latest input_append input_prepend