Merge proposals dependent on lp://staging/~jani/ubuntu-seeds/ubuntu-touch.trusty-mir-test-tools

1. ubuntu-touch.trusty-mir-test-tools
2. Dependent merge proposals