Merge "Add tests for minor version upgrade enforcement."