Bug 1093385 test addon test fixes
Correct "preferences-branch" (from package.json) issue when used with jpm
Revert "Merge pull request #1711 from erikvold/1098690"

This reverts commit 763e55167fb9919a1c9cc05e44c3edcf3d3a44e2, reversing
changes made to e0d7f425e52307aa0c9da2895ec6081509ffc3ad.
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 1093385