Merge "ensure unique revision id in backupTextPassTest"