Add blocksummaries changes; clean-up DBS3 code
Merge branch 'dbs3_blocksummaries'