update test
resolve conflict

Conflicts:

	repose-aggregator/functional-tests/spock-functional-test/src/test/groovy/features/filters/contenttypestripper/ContentTypeStripperTest.groovy