Adds a unittest to expose issue_690.

This exposes an issue that arises when sindex post construction is
interrupted due to the store being deleted.
Adds a potential fix.
Merge branch 'next' into merge_br