Merge pull request #687 from ovatsus/master

Simplify generated API for collections in XmlProvider (closes #686)