Fixed noscript/wb-disable handling for plugins and polyfills
Merge pull request #4155 from pjackson28/cleanupnoscriptwbdisable

Fixed noscript/wb-disable handling for plugins and polyfills