Merge changes from topic "nov11"

* changes:
  Mechanical refactoring to new XML resolvers.
  Mechanical refactoring to new XML resolvers.
  Progress towards efficient XML serialization.