Backout 3a43daef7bb2 / bug 876089 due to bustage in plugin mozmill tests. Unit test fix for CLOSED TREE