[BISERVER-11707] account for double encoding of / and \
Merge pull request #1658 from scottyaslan/devBranch5.1

Dev branch5.1