M12 refactoring of poor handling of 'ServletContext' in ComponentMappingTable