Merge proposals dependent on lp://staging/~julian-edwards/launchpad/cancel-build-bug-173018-ui-part4

1. cancel-build-bug-173018-ui-part4
2. Dependent merge proposals