only primary haproxy should sync and deploy
Bug 986838 - Prevent quotas from being lowered beyond usage

* Format error message for Broker to pick up
Fix for bug 985496
Merge pull request #3268 from jwhonce/bug/986838

Merged by openshift-bot
Merge pull request #3270 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Fixing gem version requirement on sass-twitter-bootstrap
Merge pull request #3271 from rajatchopra/master

Merged by openshift-bot
Merge pull request #3269 from kraman/master

Merged by openshift-bot
<admin/stats> add unit tests, fix a bug

Bug was that all nodes would be considered inactive
because it was not requesting the district_active fact.

Removed model/admin coverage exclusion. There were some
pieces of code that were too hard to exercise, will be left
for integration tests that can create users and apps for
the purpose.
<admin/stats> functional test to cover db scan method
<admin/stats> should fix oo-stats bug 988554

https://bugzilla.redhat.com/show_bug.cgi?id=988554
oo-stats throws exception - not clear what cart name was causing the
break, but this should fix it.
Merge pull request #3273 from sosiouxme/admin-stats-tests

Merged by openshift-bot