Draft: addjust current_block_num before entering massive sync

Dan Notesteinrequested to merge
dn-fix-commit-problem into develop

Merge request reports