FBTest fix for search/2886 + clean up
Merge branch 'jsd2' of github.com:firebug/firebug into jsd2