Randomizing UIDs in available_uids list for district
Fix v2 ERB processing

Fix ERB processing by reverting a portion of this commit:

https://github.com/openshift/origin-server/pull/1837/files#diff-13
Merge pull request #1871 from ironcladlou/dev/v2carts/bugs

Fix v2 ERB processing
Suppress NodeLogger calls in the context of gear script
Merge pull request #1872 from pmorie/dev/gear

Merged by openshift-bot
WIP: v2 snapshot/restore
Merge pull request #1867 from abhgupta/abhgupta-dev

Randomizing UIDs in available_uids list for district
Minor EWS spec fix to avoid gcj issues

I don't believe java-devel is an actual build time requirement for this
package.  Also, I think we need to be explicity about which java-devel we
actually want to avoid being broken by gcj.  See the following for more
details:

java-1.7.0-openjdk-devel is likely what needs to be installed since
java-1.7.0-openjdk is explicitly labeled as a requirement.  However, it does
not provide java-devel:

[root@broker yum.repos.d]# rpm -q --provides java-1.7.0-openjdk-devel
java7-1.7.0-devel = 1:1.7.0.11
java7-devel = 1:1.7.0
java7-devel-openjdk = 1:1.7.0.11
java7-sdk = 1:1.7.0
java7-sdk-1.7.0 = 1:1.7.0.11
java7-sdk-1.7.0-openjdk = 1:1.7.0.11
java7-sdk-openjdk = 1:1.7.0.11
lib.so()(64bit)
lib.so(SUNWprivate_1.1)(64bit)
libunpack.so()(64bit)
libunpack.so(SUNWprivate_1.1)(64bit)
java-1.7.0-openjdk-devel = 1:1.7.0.11-2.4.0.2.el6
java-1.7.0-openjdk-devel(x86-64) = 1:1.7.0.11-2.4.0.2.el6

java-1.6.0-openjdk-devel does provide java-devel = 1:1.6.0 but unfortunately on
a RHEL6.4 system if java-1.5.0-gcj-devel is already installed 'yum update
java-devel' will not find java-1.6.0-openjdk-devel.

[root@broker yum.repos.d]# rpm -q --provides java-1.6.0-openjdk-devel
java-1.6.0-devel = 1:1.6.0.0
java-devel = 1:1.6.0
java-devel-openjdk = 1:1.6.0.0
java-sdk = 1:1.6.0
java-sdk-1.6.0 = 1:1.6.0.0
java-sdk-1.6.0-openjdk = 1:1.6.0.0
java-sdk-openjdk = 1:1.6.0.0
lib.so()(64bit)
libunpack.so()(64bit)
java-1.6.0-openjdk-devel = 1:1.6.0.0-1.57.1.11.9.el6_4
java-1.6.0-openjdk-devel(x86-64) = 1:1.6.0.0-1.57.1.11.9.el6_4
Bug 947098 fix - add margin to h3 so icon doesn't overlap at narrow resolutions
Merge pull request #1874 from pmorie/dev/oo-snapshot

Merged by openshift-bot
Fix how erb binary is resolved. Using util/util-scl packages instead of doing it dynamically in code.
Separating manifest into RHEL and Fedora versions instead of using sed to set version.
Bug 947288
Merge pull request #1875 from sg00dwin/401dev

Merged by openshift-bot
Fixing broker functional tests:
  - PHP version selection based on OS
  - Creating user account for functional test on Origin
Merge pull request #1860 from kraman/php_v2

PHP V2 cartridge fixes
General client message streaming support
Mongodb Cartridge V2
Automatic commit of package [openshift-origin-cartridge-mongodb] release [1.6.3-1].
Correct mysqld setup and control status.

Also add WIP connection hook.
Merge pull request #1878 from kraman/bugfix

Merged by openshift-bot