Bug 985952 - strip certificate content when appending chain
Revert back to not deploying exploded wars by default in JBoss cartridges
Bug 985952 - should not touch certificate if chain was not provided
Fix for bug 989650
Merge pull request #3237 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Adding missing activemq config templates
Fixing console spec to require gems
Additional fixes to comprehensive deployment guide
Merge pull request #3225 from lnader/master

Merged by openshift-bot
Merge pull request #3227 from kraman/docs

Merged by openshift-bot
Bug 989467

This commit does *not* fix the problem described in the Bugzilla.
Rather, when git clone fails when using SSH, suggest using a different
URL scheme so that the authentication is less of a problem.

Here, the SSH URL detection is purely formal.
The passed URL is deemed SSH if one of the following condition is true:
  1. it starts with 'ssh:'
  2. it contains '@' and not '//' (consider http://user:pass@example.com/foo.git)
Merge pull request #3235 from detiber/noExplodedWars

Merged by openshift-bot
Bug 989706: Throttler dies if no cgroups are present

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

If there were no cgroups present, the `grep` command would fail.
By not expecting a 0 exit status, we can silently ignore this problem.
Merge pull request #3232 from fabianofranz/master

Merged by openshift-bot
Bug 975792
Small tweaks
Pulled cartridge READMEs into Cartridge Guide
Removed redundant nav section
Consolidated docs for admin/mgmt consoles, cartridges
Add alignment styles to CSS
Link Cartridge Guide to Index
Merge pull request #3206 from nhr/updates

Migrate most origin-server documentation