Fix return code if LS already running
Update java startup as well
Merge branch 'pr/382'