Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs