Added some code-coverage testing to CBLCollateJSON & fixed test holes
Fix for replication never going idle after checkpoint-save conflict

Fixes #128