Merge pull request #15914 from dmcgowan/fix-upload-sanitize

Fix sanitize URL bug on layer upload