17597 fix https issue with html5 shiv
Merge branch '17597-html5-shiv-proto'