Add support for passing through Origin header.
Add --quiet, --create, and --logins-file to oo-admin-ctl-user

Move oo test to origin

Update man page for oo-admin-ctl-user

Use += instead of concat

Move oo script tests to origin

Add plan_upgrade_enabled to base CloudUser class
Bug 1045971 - add alias display overlaps on iphone 4S
Merge pull request #4382 from liggitt/bulk_provision

Merged by openshift-bot
oo-admin-usage: Add a note 'Aggregated usage excludes monthly plan discounts' in the end when user plan exists
Merge pull request #4413 from jwforres/bug_1045971_iphone4S_add_alias_overlap

Merged by openshift-bot
Fix for bug 1047957
Fix for bug 1046091
Merge pull request #4415 from pravisankar/dev/ravi/admin-usage-changes

Merged by openshift-bot
Merge pull request #4269 from debug-ito/master

Merged by openshift-bot
Merge pull request #4417 from abhgupta/bug_1047957

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

Merged by openshift-bot
Bug 1026652 - Skip module checks if module exists in perl deplist.txt
Merge pull request #4410 from mfojtik/bugzilla/1026652

Merged by openshift-bot
Modify PHP stop() to skip httpd stop when the process is already dead
Applied fix to other affected cartridges