Merge "Bug 2900: Fixed incorrect instanceof check in xml codec."