Merge proposals dependent on lp://qastaging/~ci-train-bot/ubuntu-calendar-app/calendar-app-ubuntu-xenial-landing-003

1. calendar-app-ubuntu-xenial-landing-003
2. Dependent merge proposals