Merge pull request #2975 from nrwahl2/nrwahl2-T108_prep
Minor fixes and changes to XML logging functions