Node Platform - Fixed grep in node_step.rb

* grep was too greedy
Bug 989225 - the logic changed so that @container_dir is always set and @container_plugin is nil if the container no longer exists.
Bug 995599 - Add lock when building cartridge repository

* When building cartridge repository protect from an additional
  openshift mcollective being started
Add X-Forwarded-Host and Port header to the proxied connection.
Merge pull request #3396 from rmillner/BZ998068

Merged by openshift-bot
Merge pull request #3394 from jwhonce/wip/tests

Merged by openshift-bot
Merge pull request #3395 from jwhonce/bug/995599

Merged by openshift-bot
<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