Bug 1086854 - Add timeout when locking operations
Merge pull request #5248 from jwhonce/bug/1086854

Merged by openshift-bot
Bug 1086094: Taking into account the app's complete group overrides
Additionally,
 - we are now allowing only plugin carts to colocate with web/service carts
 - we are blocking plugin carts from responding to scaling min/max changes