Backport fixes from opam-repo-ci.#107

tmcgilchrist wants to merge 1 commit intoocurrent:masterocurrent/obuilder:masterfrom

tmcgilchrist:opam_fixestmcgilchrist/obuilder:opam_fixesCopy head branch name to clipboard