better copy on S3 upload settings
Merge pull request #2688 from Elberet/tests-passed

Workaround markdown-js links parser bug