Fix bug 988782: add --rerun to oo-admin-upgrade help
Bug 839581: Reset system_builder credentials on jenkins restore
Bug 966535
Merge pull request #3260 from pmorie/bugs/988782

Merged by openshift-bot
Fix origin console rhel build, add -p flag to mkdir
Fixing has_app method in mcollective
Merge pull request #3261 from ironcladlou/bz/839581

Merged by openshift-bot
Merge pull request #3264 from pmorie/bugs/966535

Merged by openshift-bot
only primary haproxy should sync and deploy
Merge pull request #3265 from jwforres/origin_rhel_build_fix

Merged by openshift-bot
Bug 986838 - Prevent quotas from being lowered beyond usage

* Format error message for Broker to pick up
Merge pull request #3266 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Update Gemfile
Revert "Update Gemfile". Pushed to wrong branch.

This reverts commit 274a0f26be664c396c512193551ab39807dd249f.
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