Merge "Fix broken Javadoc links" into kraken