GRAILS-7991 added logic to not include interceptors twice
test for GRAILS-10022 "NPE in persistence layer during unit test"
fix for GRAILS-7503 "Form Multipart Encoding for File Upload breaks Date Binding on Embedded Objects"
fix for GRAILS-8555 and GRAILS-9812 "provide ability to specify certain cross-cutting concerns typically specified in config.groovy during unit tests"
fix for GRAILS-7166 "Application needs manual restart when an abstract service is modified"
add the ability to apply a marker annotation to weaved methods
Introduce PersistenceMethod marker annotation
test for addition of marker annotation in transforms
make GormTransformer add marker annotation
fix for GRAILS-9977 "Conversion to XML and JSON fails for embedded class defined in the same file"
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/binding/DataBindingTests.groovy
Merge branch '2.2.x'

Conflicts:
	grails-bootstrap/src/main/groovy/grails/build/logging/GrailsConsole.java
	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/compiler/gorm/GormTransformer.java
	grails-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy
	grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/binding/DataBindingTests.groovy