CLC-1220 tweaks to startup scripts, qa branch version

QA branch version of changes from #668 and #669

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1220