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
Bug 99445 - Better error message for No nodes available

https://bugzilla.redhat.com/show_bug.cgi?id=994445

Fix the error message to the user when NodeUnavailableException
is raised.
Merge pull request #3382 from smarterclayton/builder_scope_incorrect

Merged by openshift-bot
Bug 997785
Merge pull request #3403 from danmcp/master

Merged by openshift-bot
Fixing typos
Merge pull request #3404 from danmcp/master

Merged by openshift-bot
Add note on creating node target directory
Simplified mkdir procedure
Handle lack of JSON reply from gear upgrades
Added 'httpd_restart_action' function to Bash SDK

This function will handle restart/start operation in case when the
HTTPD pid file is corrupted or missing or the HTTPD service is not
running for some reason.

The main purpose of this function is to make sure that HTTPD based
application will restart successfuly when stopped/crashed.