Merge "Add some missing getters for XML/Java API consistency." into jb-dev