Backed out changeset 441137505200 (bug 980178) for causing various TBPL crashes.
Bug 1017636 - Remove all conditional request headers when cache entry's sec-info or input fails to open. r=mcmanus
Merge m-c to fx-team.