Merge proposals dependent on lp://staging/~mvo/goget-ubuntu-touch/snappy-15.04-timchen-fixes

1. snappy-15.04-timchen-fixes
2. Dependent merge proposals