Merge proposals dependent on lp://staging/~kyrofa/click/xenial-package-rename

lp://staging/~kyrofa/click/xenial-package-rename has no merge proposals.