SLICE-8 Removing SlingMapperFactory
Merging branch SLICE-8