Merge "fix javadoc build" into jb-mr2-dev