Fix for Ticket 996

Cleanup headers to avoid duplicate loading of the same headers.
Duplicate loading of the protocol.js was causing ie7 to fail.

Note: The intent is to test on the master - if it does not cause any issues that we will bring the change over to the 2.8 release.