Validate struct versions in merge, revert
Merge pull request #2001 from ethomson/merge_version_validate

Validate struct versions in merge, revert