Add email field to CloudUser
Bug 1061926 - Use lock file to prevent race between idle/unidle
Bug 1086094: Multiple changes for cartridge colocation
We are:
 - taking into account the app's complete group overrides
 - allowing only plugin carts to colocate with web/service carts
 - blocking plugin (except sparse) carts from responding to scaling min/max changes
Bug 1088230 - Fix php-pecl-memcache extension

https://bugzilla.redhat.com/show_bug.cgi?id=1088230
rename locked-memcache.ini to locked-memcached.ini for consistency
Merge pull request #5192 from liggitt/user_email

Merged by openshift-bot
Merge pull request #5274 from jwhonce/bug/1061926

Merged by openshift-bot
Adding a config flag in the broker to selectively manage HA DNS entries
Bug 1065047 - changed exception raised to NodeUnavailableException to indicate retry advisable (503)
Bug 1086566 - Fix move gear: run_in_app_lock() will reload the app object and any references to its fields (in this case 'gear') need to be recomputed
Merge pull request #5286 from bparees/bug_1088230

Merged by openshift-bot
Merge pull request #5278 from lnader/master

Merged by openshift-bot
Merge pull request #5253 from abhgupta/abhgupta-dev

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

Merged by openshift-bot
Merge pull request #5289 from pravisankar/dev/ravi/bug1086566

Merged by openshift-bot