Merge proposals dependent on lp://staging/~jamesodhunt/ubuntu/vivid/ubuntu-core-snappy/u-boot

1. Vivid (15.04)
2. u-boot
3. Dependent merge proposals