Merge "fix xml markup typo" into jb-mr2-ub-dev