Fixed build errors resulting from earlier upgra...
Removed unused paths to javadoc and source in p...