Merge proposals dependent on lp:~thomir-deactivatedaccount/ubuntu-calendar-app/trunk-fix-ap1.4-errors

1. trunk-fix-ap1.4-errors
2. Dependent merge proposals