Merge proposals dependent on lp://staging/~brendan-donegan/ubuntu-autopilot-tests/bug1322064_mtp_transfer

1. bug1322064_mtp_transfer
2. Dependent merge proposals