Upgraded to latest asciidoclet
Consolidated buildPackageClass