Bug 1017661 - Dont add a leading slash in non-http based mappings.  Other fixes.