Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56657#c2
Ensure that re-mapping selects the context version that we expect.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1604661 13f79535-47bb-0310-9956-ffa450edef68