Fix docs typo
Bug 1073576: Replacing rpcutil usage with openshift agent
 - Also fixing indentation with one method
Bug 1065276 - Skip *.rpmnew when loading environments
Postgresql log still goes to old path after migration

https://bugzilla.redhat.com/show_bug.cgi?id=1080800
Check the existing postgresql on INT after server upgrade and gear
migrate.
The postgresql log still goes to old path. The new log file generated
but has zero length.
util: add nodejs context for bundle exec call

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

NodeJS needs to be available for `bundle exec` call in `ruby/lib/util`
since it triggers asset compilation

See also:
* https://github.com/openshift/rails-example/commit/07d01120b308f415416a78d0bd7e9bd339d9ead3
* https://github.com/openshift/origin-server/commit/608c94857d26dd3242928c91fd30097b3775896b
Ensure modified confs are replaced during upgrades

Version specific ERB files should be copied during setup rather
than install; otherwise, new conf files will never be copied
to the live cartridge conf directory during upgrades (as install
is only called once during the life of the cart, whereas setup
is invoked during install/upgrades but prior to ERB processing).

Resolve bug: https://bugzilla.redhat.com/show_bug.cgi?id=1080836
Use consistent log format across jboss carts

Resolve bug https://bugzilla.redhat.com/show_bug.cgi?id=1080932
Fix bash brace expansion
Merge pull request #5068 from abhgupta/bug_1073576

Merged by openshift-bot
Update Cartridge Versions for Stage Cut

- Mark all cartridges (except for jenkins-client and switchyard) for incompatible
  upgrade, mainly because of the logshifter code

https://trello.com/c/tvLrlNrM - origin_cartridge_160
Bug 1072289 - Execute patching user env vars only on current group instance gears when gear_instance_id is passed
Merge pull request #5078 from jwhonce/bug/1065276

Merged by openshift-bot
Merge pull request #5080 from dobbymoodge/BZ1030873

Merged by openshift-bot
Merge pull request #5081 from ironcladlou/phpmyadmin-erb-fix

Merged by openshift-bot
Merge pull request #5084 from ironcladlou/jboss-log-formats

Merged by openshift-bot
Merge pull request #5079 from bparees/postgres_wrong_log

Merged by openshift-bot
Merge pull request #5085 from VojtechVitek/fix_bash_brace_expansion

Merged by openshift-bot
Merge pull request #4972 from RickvdP/patch-1

Fix docs typo
Bug 1070884 - When web-framework gear is moved, run force-stop in the end after all carts are stopped
Merge pull request #5086 from VojtechVitek/latest_versions

Merged by openshift-bot