Fixing aggregateJavadoc
Merge remote-tracking branch 'build/multi-project' into 1.1