Move back the files into the folder keeping FBTest files for issue 6253
Extend the FBTest for issue 6253 to cover issue 7323
Merge branch 'master' of http://github.com/firebug/firebug