Bug 913217
Bug 916026 - Removing hardcoded library version references from jenkins password encoder classpath

Conflicts:

	cartridges/openshift-origin-cartridge-jenkins-1.4/info/hooks/configure
Bug 913217
Fix for bug 916268 - adding properties for embedded carts in application rest response
Note: this was opened as a regression for bug 812046
Use update rather than find_and_modify
Bug 916311 - Expired tokens should be hidden
Merge pull request #1471 from brenton/BZ916026

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

Fix for bug 916268 - re-adding properties for embedded carts
Merge pull request #1473 from danmcp/master

Switching some find and modify calls to updates
Merge pull request #1474 from bdecoste/master

Bug 913217 895507 [merge]
Fix for bug 916323 -
 making sure that we delete all applications and re-verify
 before force-deleting a domain
Bug 901743 - Add the various other commonly used TMP variables.
Bug 901445 - Minor output tweak.
Bug 901424 - Hide the mco command.
Added index on 'login' for usage_record and usage mongoid models
Added separate usage audit log, /var/log/openshift/broker/usage.log instead of syslog.
Moved user action log from /var/log/openshift/user_action.log to /var/log/openshift/broker/user_action.log
Added Distributed lock used in oo-admin-ctl-usage script
Added Billing Service interface
Added oo-admin-ctl-usage script to list and sync usage records to billing vendor
Added oo-admin-ctl-usage to broker-util spec file
Fixed distributed lock test
Add billing service to origin-controller
Some more bug fixes
Bug 915527 - Session capabilities not cleared when domain/app changed

The session sweeper that clears capabilities was broken when we improved the capabilities support last sprint.  It was still trying to delete the old name, so the session cache wasn't cleared.
Merge pull request #1480 from smarterclayton/bug_916311_expired_tokens_should_be_hidden

Merged by openshift-bot
fix oo-admin-clear-pending-ops with respect to rollbacks
reverted US2448
Merge pull request #1481 from abhgupta/abhgupta-ssh-keys

Merged by openshift-bot