Merge "Doc update: misc fixes" into jb-mr1.1-docs