More complete network assimilation

- Wait for client to assimilate consensus before submitting POR block
- Wait before rejecting a block
- Handle sync-checkpoint %s is conflicting with current sync-checkpoint
error
- More support for the new CPID hashing algo (50% complete)