CLC-2420 Smarten up the stop script; go into maint mode from upgrade.sh
CLC-2420 More script tweaks as suggested by Darlene
Merge pull request #1539 from ctweney/clc-2420-qa

CLC-2420 (QA) Improving the start/stop scripts