Resolved all superficial race conditions exposed by running the plugin
tests using the `-race` flag.
Merge pull request #954 from mozilla-services/plugin-test-races

Resolved all superficial race conditions exposed by running the plugin