Bug 989225 - the logic changed so that @container_dir is always set and @container_plugin is nil if the container no longer exists.
<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 #3393 from rmillner/BZ989225

Merged by openshift-bot
Merge pull request #3397 from danmcp/master

Merged by openshift-bot
WIP Node Platform - Add support for settable user variables

* Update Openshift mcollective agent and ddl
* Move gear ssh key creation to happen when gear created
* Added oo-user-var-add/remove/list commands
* Create .env/user_vars when creating gear

Bug 988759 - Failed to override the existing variables
Bug 988691 - Failed to add the 25th user variables
User vars node changes:
 - Use 'user-var-add' mcollective call for *add* and/or *push* user vars. This will reduce unnecessary additional code/complexity.
 - Add some more reserved var names: PATH, IFS, USER, SHELL, HOSTNAME, LOGNAME
 - Do not attempt rsync when .env/user_vars dir is empty
 - Misc bug fixes
Added User environment variables support in broker

Use x.present? instead of (not x.nil? and  not x.empty?)
Added REST api support for user environment variables

Allow environment variables support for REST version <= 1.5
Node Platform - make user variable rsync more reliable