BZ1087545 - Fix filename format for rotated logs
fix phpmyadmin PHP_INI_SCAN_DIR bug

PHPMyAdmin runs on PHP 5.3, even if it's attached to PHP 5.4 or Zend Server.

Bug 1086220 - https://bugzilla.redhat.com/show_bug.cgi?id=1086220
Bug 1083730 - Move node-web-proxy logs to /var/log/openshift/node
Re-introduce cartridge-scoped log environment vars
Revert hack for bug#1086910, other tests are affected
Merge pull request #5257 from a13m/bz1087545

Merged by openshift-bot
Merge pull request #5258 from VojtechVitek/bug_1086220

Merged by openshift-bot
Merge pull request #5259 from jwhonce/bug/1086886

Merged by openshift-bot
Merge pull request #5264 from jwhonce/bug/1083730

Merged by openshift-bot
Merge pull request #5260 from ironcladlou/cart-log-vars

Merged by openshift-bot
Merge pull request #5261 from pravisankar/dev/ravi/revert-remote-user-hack

Merged by openshift-bot
added oo-admin-ctl-team
Bug 1085669 and 1085685
changed save to save! and fixed typo
Bug 1087593
Give better error message in case of connection failures. i.e. authentication failure
Bug 1086427 - Do not use JSON.load() with untrusted JSON

* see https://www.ruby-lang.org/en/news/2013/02/22/json-dos-cve-2013-0269/
Bug 1086427 - JSON.load() allowed empty JSON files
Merge pull request #5265 from jwhonce/bug/1086427

Merged by openshift-bot
Merge pull request #5143 from lnader/global-teams

Merged by openshift-bot