Bug 839273 - Add more safegaurds for headers being deleted while they have pending operations r=asuth