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
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]