Merge "Remember having done full-data as well as key/value app backups" into lmp-dev