fix missing files and wrong docs

These were accidentally included from the temporarily proprietary
1819-cloud-merge branch.

Thanks to Daira and Leif for pointing these out.