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
Redirect streams to /dev/null unless verbose enabled

Redirect stdout and stderr to /dev/null unless the verbose option
is specified. This is a usability enhancement for the majority
use case which is a daemon-like mode for logshifter in which no
output should ever be expected from the program. If the streams
are left open and undirected, readers may block waiting for
output from logshifter itself.

Resolves bug https://bugzilla.redhat.com/show_bug.cgi?id=1085068
Fixes related to bug 1062499
console/help and console/app/create search field css
Merge remote-tracking branch 'upstream/master'
separate scaling and storage tracking events
Moved pruning of non-districted/non-zone nodes(when districted/zone nodes are available) from rpc_find_all_available to select_best_fit_node.
Rationale: Node selection plugin should have flexibility to choose any candidate node from non-districted/districted/non-zone/zone nodes.
Bug 1071272 - oo-admin-repair: Only allow node removal from its district when no apps are referencing that node

Fix application functional test
Bug 1071393 - Fix DNSLoginException
Merge pull request #5181 from ironcladlou/logshifter-stdout-close

Merged by openshift-bot
Merge pull request #5163 from pravisankar/dev/ravi/bug1071393

Merged by openshift-bot
Merge pull request #5184 from danmcp/master

Merged by openshift-bot
Merge pull request #5185 from pravisankar/dev/ravi/fix-node-selection

Merged by openshift-bot
Fixing error message around submodule repo
Merge pull request #5186 from danmcp/master

Merged by openshift-bot
Bug 1074237 - Exclude python template *.pyc and *.pyo from spec file
Merge pull request #5188 from jhadvig/python_build

Merged by openshift-bot