Merge "backuptool: only restore from same major.minor version" into cm-10.1