Startup script fixes
Begin arcbot message
This merge request is automatically copied from !701 (merged) orginally made by @ellert
End arcbot message
BUGZ-3808, BUGZ-3809
Begin arcbot message
This merge request is automatically copied from !701 (merged) orginally made by @ellert
End arcbot message
BUGZ-3808, BUGZ-3809