ZEN-13262: Add support for version conflict detection.
Merge pull request #974 from control-center/feature/ZEN-13262

ZEN-13262: Add support for version conflict detection.