Merge "Fix the xml parsing of multi-package sessions."