Add support for using the discriminator column as XML attribute
Merge branch 'xml-discriminatorattribute'