Start turning lockedSet into a BlockBitmap, refactoring all uses as well, and implementing conversion.
Note changes for 2.1.4-pre1
Back-merged 2.1.4 locked blocks improvements