adding OPENSHIFT_MYSQL_TIMEZONE env variable
updating oo-cartridge-guide
Mongoid error on app.save results in gear counts being out of sync
Bug 1033581 - Adding upgrade logic to remove the unneeded jenkins_shell_command files

This is the squashed version of https://github.com/openshift/origin-server/pull/4424
Merge pull request #4433 from smarterclayton/save_failures_leave_gears_reserved

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

Merged by openshift-bot
Merge pull request #4431 from jhadvig/mysql_timezone

Merged by openshift-bot
<comprehensive deployment guide> Fix unterminated code block

Section 9.7.2 ("Install front-end plugins") contained a code block
that wasn't closed properly. This broke formatting for most of the
document that followed.
Merge pull request #4441 from dobbymoodge/fix_adoc

Merged by openshift-bot
Merge pull request #4434 from brenton/BZ1033581_rebase1

Merged by openshift-bot