Pull maven-javadoc-plugin changes from airbase
Pull maven-compiler-plugin changes from airbase