BZ#1160860 - Update routing-daemon.conf setting defaults for NGINX to 1.6
File.join -> PathUtils.join

Convert File.join to PathUtils.join in the vhost plugin
Add logging about idling/unidling in vhost plugin

Add logging about idling/unidling in the vhost plugin. Attempting to
determine what's going on with bug 1161165.
Merge pull request #5942 from calfonso/bz1160860

Merged by openshift-bot
BZ#1159392 - Add HTTPS configuration for all applications with NGINX

This patch adds:
* Config settings for the location of the SSL
  certificate and key.
* Sets up a common certificate and key that all applications can use
  to access HA apps over HTTPS without having to set up an alias
  and adding an app specific cert/key
Bug 1161263 - Support class method truncate()
Fix race condition in team creation
Bug 1162096 - Fix oo-admin-gear destroygear
Merge pull request #5940 from ncdc/bug/1161165-missing-idler-conf

Merged by openshift-bot
Merge pull request #5946 from calfonso/bz1159392

Merged by openshift-bot
Merge pull request #5941 from derekwaynecarr/issue_1162128

Merged by openshift-bot
Merge pull request #5935 from jwhonce/bug/1161263

Merged by openshift-bot