Merge proposals dependent on lp:~cjohnston/launchpad-work-items-tracker/add-milestones-to-pages

1. add-milestones-to-pages
2. Dependent merge proposals