Merge proposals dependent on lp://staging/~michael-sheldon/ubuntu-seeds/ubuntu-vivid-touch-add-new-keyboard-layouts

1. ubuntu-vivid-touch-add-new-keyboard-layouts
2. Dependent merge proposals