update
Merge branch 'master' of https://github.com/bdecoste/openshift-origin-cartridge-camelvertx