Merge "Move XML utility methods into shared location." into jb-mr2-dev