Merge "Require the current backup pw in all backup/restore operations"