fix broken test
Some ExtKey were not correctly derived.
do not store blockstore end in the lock
Merge remote-tracking branch 'upstream/master'