Merge pull request #59 from kraman/f19_fixes

Merged by openshift-bot
First pass at removing v1 cartridges
Merge pull request #61 from danmcp/master

Merged by openshift-bot
WIP