Refactoring the path info calculation to NOT strip out the context path + general DRY making

Reason being that some people may actually want to make use of the context path as part of the URL - when you don't, just need to ensure that the proxy sets the 'X-Original-URL' header