Sharing template block with 2.1: step 7: Removing the JXTemplateTransformer and JXTemplateGenerator classes that conflict with those from C2.1