Merge "Make plugin servlet's context path authorization aware" into stable-2.6