-- Fix servlet and servlet mapping order issue.