Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs