Modify some test setups to work correctly in Origin context
Merge pull request #4966 from nhr/test_fixes

Merged by openshift-bot
Added User pending-op-group/pending-op functionality
Added pending op groups for user add_ssh_keys/remove_ssh_keys

lock_user/unlock_user changes:
 - pass user.id/app.id instead of user/app mongoid objects.
   This will help anyone with bson id does not have to fetch corresponding mongoid model to acquire user lock (eg: oo-admin-repair)
 - app.id is optional to acquire user lock. Once user lock is acquired, no one should get application lock to avoid deadlocks.

Any pending op related to capabilities will be protected by application and user lock or just user lock if app is not involved.

Fix oo-admin-clear-pending-ops: Use run_jobs for user and app

Fix oo-admin-ctl-user: Take user lock for updating user capabilities

Fix test cases

Added new test cases for Lock model

Default app_user_lock timeout is 15 secs and default user_lock timeout is 15 secs. User lock with heavy ops like plan update has timeout of 30 mins similar to app timeout.

More fixes + cleanup
Merge pull request #4824 from pravisankar/dev/ravi/car587

Merged by openshift-bot
oo-accept-broker: improve err handling & more

https://trello.com/c/CBLIqG00/214-1-oo-diagnostics-improvements

Somewhere along the way, oo-accept-broker stopped handling broker load
and run errors gracefully. Error output got combined with stdout, and
then that was truncated to the expected number of lines and used as the
expected response, meaning we got bits of stack trace instead of the
configuration values intended, and tried to actually use those.

Now, any error output is routed and noted separately. The error bubbles
up properly and is generally only noted once.

Also, a lot of separate calls invoking the broker for settings were
combined into a single call. This makes the script execute in about half
the time it required before.

Also, some settings were potentially being read from the production
settings file when the development one should have been used. This is
fixed too.

The order of the tests was changed around a little bit but everything
should otherwise work the same.
Merge pull request #4969 from sosiouxme/fix-oo-accept-broker

Merged by openshift-bot
Rebalancing tests
Merge pull request #4971 from danmcp/master

Merged by openshift-bot
Remove unused teardowns
Merge pull request #4973 from danmcp/master

Merged by openshift-bot
Revert "Rebalancing tests"

This reverts commit 444c6a496f6826de78a4338e580d153d1620e406.