Minor improvements to shell scripts for local building
Merge branch 'java-bootstrap' into typesmart