Merge "misc doc bug fixes" into jb-dev