1) Bringing back the ability to build from Java6, if desired
2) Improved efficiency of buld diagnostic report generation