Fix RequestDispatcherRequestWrapper inconsistency between `getRequestURI` and `getRequestURL`

Fix for #861.
still needs to fix indentation, 2 spaces indent, not 4.
also internal spacing too -- space btw if and the (, no space btw the ( & code, so:
  `if ("https".equals(scheme)) {
     .. 
  }