Merge "Add missing XML close tag. Fixes bug 6488238." into jb-dev