Bug 1025240 - test-native-options should cleanup the preference branches that it creates
Merge pull request #1514 from erikvold/1025240

Bug 1025240 - test-native-options should cleanup the preference branches that it creates r=@zombie