Rework the bootstrapping/launching, to make test time launching more robust.
Javadoc fix.