Shared template files support - added PolyVariantResolver
Fixed conflict with Spring XML Introspection 'Cannot resolve symbol' on id attribute