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
Automatic commit of package [openshift-console] release [0.0.2-1].
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
Added man pages for broker-util/node-util, port complete-origin-setup to bash

move broker-utils to /usr/sbin

oo-namespace-init man page from tdawson

re-converted to man, adding title/section

added oo-register-dns man page

added SEE ALSO and fixed AUTHOR section oo-register-dns

added small script to convert man pages

added oo-accept-broker man page

fixed typo, added a little clarification

add oo-admin-chk man page

added man page for oo-admin-ctl-district

added man page for oo-admin-ctl-app

move old /bin/ to /sbin/ references where applicable, clean up

moved some stuff around for cleanliness

added man page for oo-admin-ctl-domain

added man page for oo-admin-ctl-template

added man page for oo-admin-ctl-user

added man page for oo-admin-move

added man page for oo-setup-bind

added oo-setup-broker man page

add the new man pages to the spec file for boker-util

added man page for oo-accept-node

added man page for oo-app-idle

add oo-autoidler man page, fix others see also section

add oo-idler man page, commit fixes

added man page for oo-idlet-stats

added man page for oo-init-quota

added man page for oo-list-stale, fixed spacing on others

added man page for oo-restorer

added man page for oo-restorer-wrapper.sh

added oo-setup-node man page, date bump all others

man page added to rhc-list-ports

added man page for oo-last-access

added man pages to spec

nuke sbin move, will handle that later
fix man page path names for node-util spec
Merge pull request #787 from maxamillion/dev/maxamillion/move_utils_man_pages

Merged by openshift-bot
Automatic commit of package [openshift-origin-port-proxy] release [1.0.1-1].