Bug 1084379 - Added ensure_httpd_restart_succeed() back into ruby/phpmyadmin
Add global_teams capability

Rename capability to view_global_teams
Use configured default
Merge pull request #5168 from mfojtik/bugzilla/1084379

Merged by openshift-bot
Fix indent, oo-admin-ctl-user usage
Enable global team view for functional tests
Bug 1084094 - provide libgit2-devel and rubygem-rugged
Merge pull request #5174 from liggitt/global_teams_capability

Merged by openshift-bot
Merge pull request #5176 from tdawson/2014-04/tdawson/add-libgit2-devel-dep

Merged by openshift-bot
Bug 1084054: Check for external cartridge for group instance without gears
Merge pull request #5177 from abhgupta/abhgupta-dev

Merged by openshift-bot
Use mock cart for testing
Merge pull request #5179 from danmcp/master

Merged by openshift-bot
Allow version of jQuery newer than 2.0
Merge pull request #5180 from liggitt/update_jquery

Merged by openshift-bot
apache frontends: move directives to global conf

https://trello.com/c/RF3kubpI/428-remove-unnecessary-directives-from-frontend-vhost-definitions-enterprise

Move configuration directives out of the front end templates so that
they don't have to be re-created (requiring an outage) if there is a
need to modify them:

    ServerAdmin
    SSLProtocol
    SSLHonorCipherOrder
    SSLCipherSuite
    ProxyTimeout
apache frontends: refactor logging conf, includes

https://trello.com/c/RF3kubpI/428-remove-unnecessary-directives-from-frontend-vhost-definitions

apache-vhost confs had logging directives inline; these were extracted
to a single logging conf file, which admins can modify if they see fit.
Additionally, "Include" directives allow the admin to create an extra
custom conf file that all vhosts will include, completely separate from
anything OpenShift lays down, to minimize the need for modifying files
OpenShift does lay down.
httpd conf: set better defaults