Using URI.parser.unescape to avoid warnings
Merge pull request #11724 from arunagw/warning-removed-ap

Using URI.parser.unescape to avoid warnings