Test cases for the nodejs use_npm marker
Platform logging enhancements

Provide enhanced logging capabilities:

* Add a Syslog logger implementation
* Make MCollective request-scoped context available to logger impls via NodeLogger
* Allow request-scoped context to be attached to log events via configuration for SplitTraceLogger and SyslogLogger implementations
Merge pull request #4628 from lnader/master

Merged by openshift-bot
Tolerate custom cartridges in the broker in the console

React more appropriately to a custom cart showing up in the app types
list and the cart types list.  Other small view / behavior tweaks.
Broker should allow version to be specified in Content-Type as well
Merge pull request #4594 from smarterclayton/tolerate_custom_carts_in_broker

Merged by openshift-bot
Merge pull request #4513 from smarterclayton/broker_handle_content_type_version

Merged by openshift-bot
<httpd carts> bug 1060068: ensure extra httpd conf dirs exist

https://bugzilla.redhat.com/show_bug.cgi?id=1060068
httpd cartridges won't see new /etc/openshift/cart.conf.d dirs when restarted
Store cartridge_pid in bash variable
SSL Configuration : ssl.conf and openshift_origin_broker_proxy.conf conflict + assets ProxyPass (console icons)
Merge pull request #4632 from sosiouxme/custom-httpd-confs

Merged by openshift-bot
SSL Configuration subsection
Merge pull request #4625 from mfojtik/card_89_tests

Merged by openshift-bot
Merge pull request #4624 from ironcladlou/dev/syslog

Merged by openshift-bot
Bug 1057734 - Protect against divide by zero
wording about ssh configuration (mainly integrate nhr review/feedback)
Merge pull request #4633 from mfojtik/card_89_cart_pid

Merged by openshift-bot
Bug 1018342 - Stop restore/throttle flapping
Merge pull request #4635 from jwhonce/bug/1057734

Merged by openshift-bot
Merge pull request #4634 from boly38/patch-4

Merged by openshift-bot