Merge proposals dependent on lp:~frankencode/ubuntu-calendar-app/testrun-fix

lp:~frankencode/ubuntu-calendar-app/testrun-fix has no merge proposals.