Merge pull request #2642 from jwhonce/bug/967118

Merged by openshift-bot
Various cleanup
Merge pull request #2643 from danmcp/master

Merged by openshift-bot
Bug 962657: Return db info to client during postgres install
Bug 966963: Remove unnecessary versioned conf files from php cart

The php 5.3/5.4 configuration files all symlink back to shared. Remove the specific version
directories/files and use only the shared directory for setup. This also fixes a bug where
the symlinks to shared become broken during setup (as ERBs are removed during processing)
and cause the remaining symlinks to be re-processed as ERBs (which fails).
Merge pull request #2644 from ironcladlou/bz/962657

Merged by openshift-bot
Merge pull request #2645 from ironcladlou/bz/966963

Merged by openshift-bot
Merge remote-tracking branch 'origin/master' into site_nav_changes
Ignore gears without frontend mappings in the idler.
Merge pull request #2646 from mrunalp/bugs/idler_standalone_dbs

Merged by openshift-bot
Bug 966876 - Fix AVC denial in jbossas7 and jbosseap6 carts on startup

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

Redirect stderr to /dev/null when running oo-cgroup-read from bin/standalone.conf in jbosseap and jbossas v2 carts.  These are run with stderr redirected to a logfile in the gears tmp directory and oo-cgroup-read is trying to open a file handle to this logfile causing an AVC denial
Bug 962657: Add client result for mongodb credentials during install
Bug 967518
php v2 cartridge clean-up

- Control script
  - clean-up
  - add return codes
  - add graceful restart
  - add configtest
  - fix reload
- Teardown - remove ~/.pearrc
- Remove extra include in the conf/httpd*.conf files (the conf.d/*.conf are included automatically)
- Remove unused bin/deploy
- Remove unused lib/util
WIP Cartridge Refactor - Updated Guide

* Results of review by documentation group
Merge pull request #2653 from jwhonce/wip/documentation

WIP Cartridge Refactor - Updated Guide
Add cherrypy to python 3.3 template.
Merge pull request #2649 from ironcladlou/bz/962657

Merged by openshift-bot
Bug 967532: Fix initial ROOT.war deployment for jboss cartridges

Install the initial ROOT.war into both the live deployments directory and the
template app repo to ensure unmodified applications correctly scale up.
Clear cartridges when applications are reloaded, fix downloadable application test