Randomizing UIDs in available_uids list for district
Merge pull request #1868 from lnader/master

Merged by openshift-bot
default read should be from primary
Merge pull request #1870 from rajatchopra/master

Merged by openshift-bot
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
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.
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
Merge pull request #1878 from kraman/bugfix

Merged by openshift-bot
General REST API clean up - centralizing log tags and getting common objects