Comment 6 for bug 1508142

I have some in-progress packages in landing silo 55 at the moment. Using Alan's test files, the main scanner daemon no longer crashes (so the startup directory scan isn't repeated), but it looks like there are still a few corner cases to fix up.