Bug 966137 - Ensure we only attempt one datastore write operation at a time. r=kgrandon
Merge pull request #15863 from daleharvey/966137

Bug 966137 - Ensure we only attempt one datastore write operation at a time. r=kgrandon