WELD-1648 Use more robust strategy for dealing with Servlet includes/forwards