Fixing aggregateJavadoc
Adding mavenLocal() for local resolution
Merge remote-tracking branch 'build/multi-project' into mhawthorne-debug
Forcing merge from multi-project