Only allow restore from backups from versions with the same two  first version numbers
Merge branch 'jag/restore-only-from-same-version' into 3.5

Conflicts:
	main/core/ChangeLog