ECOM-848: No Flash Detected Error; HTML rendering as text

@AlasdairSwan please review

This includes the commit from the ECOM-811, which will soon be merged to master.  The relevant changes in this PR are in the second commit: https://github.com/edx/edx-platform/commit/d842b32892cebad7904e4d42667e475af8fa4818