Bug 907522: Uplift intermittent test fixes from Add-on SDK. a=test-only.

https://github.com/mozilla/addon-sdk/compare/92b4920cc781...1d05d451aac9