Made choice of output package for circular units deterministic
Merge commit '31585629db51acabd7ba2d615ae9962672397225' into separate-compilation-bootstrap
Fix to previous commit
Merge commit '31a4d5ef856f254d077a5f6502a95625cb9bb4be' into separate-compilation-bootstrap
Fixes to build scripts: update java bootstrap fro correct branch