Bug 853092 - During `cfx test`, the output is polluted by several "info: add-on sdk:" messages in page-mod
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 853092

Conflicts:
	test/test-page-mod.js
Merge pull request #1394 from erikvold/853092

Bug 853092 - During `cfx test`, the output is polluted by several "info: add-on sdk:" messages in page-mod r=@ZER0