Watchman filters out haproxy/logshifter

Make Watchman's GearStatePlugin filter out haproxy and logshifter
related processes so it can better determine when to start a gear whose
processes have died.

Bug 1133629
mysql cart: simplify user env var check

Eliminate the "`-n`" test for `OPENSHIFT_MYSQL_START_TIMEOUT` (and
...`_STOP_TIMEOUT`) and replace it with the `set -u` safe
`${OPENSHIFT_MYSQL_START_TIMEOUT:-}` expansion
Merge pull request #5814 from ncdc/watchman-filter-logshifter-haproxy-bz1133629

Merged by openshift-bot
Merge pull request #5816 from dobbymoodge/mysql_cart_tweak

Merged by openshift-bot
Multiple bug fixes:
Bug 1086061 - Should update the description of clean command for oo-admin-ctl-cartridge tool
Bug 1109647 - Loss of alias on SYNOPSIS part for oo-admin-ctl-app
Bug 1065853 - Should prompt warning when leaving source code url blank but add branch/tag during app creation
Bug 1143024 - A setting of ZONES_MIN_PER_GEAR_GROUP=2 with two available zones will always error as though only one zone is available
Bug 1099796 - Should refine the error message when removing a nonexistent global team from file
Merge pull request #5819 from abhgupta/abhgupta-dev

Merged by openshift-bot