Bug 969417 - Reduce insanity in favicon cache concurrency. r=rnewman
Bug 969417 - Cleanup naming conventions in favicon code. r=rnewman