Ensure that no-op operations don't fail with constraint violations errors.
Merge pull request #1309 from benbc/2.0-constraints-dont-fail-noops

Ensure that no-op operations don't fail with constraint violations errors