Merge branch 'master', remote branch 'upstream/master'

* upstream/master: (285 commits)
  Revised test setup to reuse domain if available
  fixing file name typo in usage and fixing domain name in test environment file
  Automatic commit of package [pam_openshift] release [1.0.4-1].
  remove invalid rel eng package
  enable defaults on subaccounts also
  Decouple hook subprocess streams from the parent process
  Fix submodule extraction by expanding ~ properly
  Make stop function work when called prior to any app start
  Automatic commit of package [pam_openshift] release [1.0.3-1].
  fixing pam_openshift Obsoletes
  changing requires from pam-openshift to pam_openshift
  doing a rename to get through the merge
  doing a rename to get through the merge
  merging with upstream changes
  removing unnessisary sections needed only by RHEL5
  adding version-release to Provides, remove Obsolete
  remove unessesary gcc-c++ and make BuildRequires
  full source URL in spec file
  Remove sass requires, handled by gemfile
  Automatic commit of package [openshift-origin-cartridge-haproxy-1.4] release [0.16.8-1].
  ...

* master:
Bug 860972 - Should provide meaningful error message when adding existing alias to another app
Merge remote branch 'upstream/master'

* upstream/master: (62 commits)
  Automatic commit of package [openshift-origin-cartridge-haproxy-1.4] release [0.16.9-1].
  Automatic commit of package [openshift-origin-cartridge-jbossas-7] release [0.98.9-1].
  Automatic commit of package [openshift-origin-cartridge-diy-0.1] release [0.33.9-1].
  Automatic commit of package [openshift-origin-node-util] release [0.0.8-1].
  Automatic commit of package [rubygem-openshift-origin-auth-remote-user] release [0.0.15-1].
  Automatic commit of package [rubygem-openshift-origin-console] release [0.0.14-1].
  Automatic commit of package [openshift-origin-cartridge-postgresql-8.4] release [0.14.9-1].
  Automatic commit of package [openshift-origin-cartridge-mysql-5.1] release [0.33.9-1].
  Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [0.4.10-1].
  Automatic commit of package [openshift-origin-cartridge-jbosseap-6.0] release [0.7.6-1].
  Automatic commit of package [openshift-origin-cartridge-mongodb-2.2] release [0.26.10-1].
  Automatic commit of package [openshift-origin-cartridge-abstract] release [0.17.20-1].
  Automatic commit of package [rubygem-openshift-origin-common] release [0.16.8-1].
  Automatic commit of package [rubygem-openshift-origin-controller] release [0.17.20-1].
  Automatic commit of package [rubygem-openshift-origin-node] release [0.17.14-1].
  Fixing rhc-list-ports permissions issue
  fix an ss reference
  BZ870385 - Remove unnecessary %post logfile touching from the Broker
  Removing a useless semanage command from the broker's %postun
  openshift-origin-broker rpmdiff errors
  ...
Update all form related styles to the latest in https://github.com/thomas-mcdonald/bootstrap-sass based on bootstrap v2.1.0. Doing so required changes in several partials that are hooked into these latest styles.

Their is also a bug 868829 involving the scale app prepend forms that is fixed.
Merge branch 'master' of git://github.com/openshift/origin-server
First pass at trusting the local console-to-broker traffic
fix broker-util version number
OpenShift Origin console package
Cleanup typo in messages.
Automatic commit of package [openshift-console] release [0.0.2-1].
Remove need of workaround in fix for bugz 869874 -
move ~/node_modules to ~/.node_modules
Merge pull request #782 from sg00dwin/master

Merged by openshift-bot
Merge pull request #783 from maxamillion/dev/maxamillion/fix_broker_utils_version

Merged by openshift-bot
Merge pull request #785 from ramr/master

Merged by openshift-bot
bumping specs to at least 1.0.0
Merge pull request #778 from lnader/master

Merged by openshift-bot
Merge pull request #784 from calfonso/master

Merged by openshift-bot
Merge pull request #786 from danmcp/master

Merged by openshift-bot