Merge "fix javadoc build also add some docs to the service" into jb-mr2-dev