Merge pull request #2839 from ClusterHQ/invariant-error-FLOC-4452

[FLOC-4452] Delay invariant checks until all diff operations have been applied

Author: @wallrj
Reviewer: @exarkun 
Fixes: https://clusterhq.atlassian.net/browse/FLOC-4452

Author: wallrj