<cartridge-jbossews> Bug 961628 - Fix Categories listed

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

Update the Categories, so that the EWS 1.0 cartridge does not advertise
tomcat7 and the EWS 2.0 cartridge does not advertise tomcat6
Merge remote-tracking branch 'origin/master' into site_nav_changes
Merge remote-tracking branch 'sg00dwin/nav-branch-to-merge' into site_nav_changes
Card online_ui_278 - Log helper utility
Fix problem in v2_cart_model_test that invalidates accept-node
Bug 960880 - PassEnv required for mod_perl

* Naming environment variables via PassEnv required by mod_perl
Fix bug 958977
Fix problem in v2_cart_model_test that invalidates accept-node
WIP cuke reorganization
Add erb processing to managed_files.yml
Also fixed and added some test cases
Use rhcsh for ssh commands
Merge pull request #2456 from bdecoste/master

Merged by openshift-bot
Bug 962805
Merge pull request #2457 from twiest/dev/twiest/quick

Merged by openshift-bot
Merge pull request #2458 from detiber/bz961628

<cartridge-jbossews> Bug 961628 - Fix Categories listed
<haproxy_ctld.rb> Bug 962714 - Fix p_usage method to exit immediately

p_usage was run twice when haproxy_ctld was run with -h, since call to
"exit" didn't bypass exit handlers. Changed to "exit!" which drops
straight out of process.

Clone of bug https://bugzilla.redhat.com/show_bug.cgi?id=920990
Merge pull request #2455 from pmorie/bugs/958977

Merged by openshift-bot
Merge pull request #2460 from ironcladlou/dev/v2carts/cuke-reorg

Merged by openshift-bot
Fix bug 962934
Merge pull request #2447 from jtharris/features/Card278

Merged by openshift-bot