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

QA branch version of #1538