GH-3465: Preserve trailing slash
3 files changed