Accommodate a default version.
Merge branch 'backups-storage' into backups---merge
Eliminate pre-merge hacks.
Add an API facade for backups.
Add tests.