Merge "fix javadocs" into jb-mr1-dev