Bug 835778
Merge pull request #2210 from danmcp/master

Bug 835778
Merge pull request #2034 from abhgupta/abhgupta-dev

Merged by openshift-bot
Splitting configure for cartridges into configure and post-configure