Minor changes to source and build files to get javadoc generation working.