<cartridge versions> origin_runtime_219, fix up cart references for renamed cart
https://trello.com/c/evcTYKdn/219-3-adjust-out-of-date-cartridge-versions

Some tests still referred to original cart versions (jbosseap-6.0, etc.)
patch upgrade.rb to use gear_map_ident for upgrade_cartridges ident resolution
additional version changes
Merge pull request #3397 from danmcp/master

Merged by openshift-bot