Merge feature branch content-type-manager

adapted method 'prepareMapper()' in case of new constructor of ContentMapper using new parameter for ContentTypeManager