CLC-2420 Improving the start/stop scripts

https://jira.media.berkeley.edu/jira/browse/CLC-2420