Fix RequestDispatcherRequestWrapper inconsistency between `getRequestURI` and `getRequestURL`

Fix for #861.
I would *love* it as a build-time dependency for the tests if it meant we can get integration tests.  We really really need integration tests for servlet.  These mock tests are far too brittle.