Merge proposals dependent on lp://qastaging/~vthompson/ubuntu-terminal-app/backspace-and-enter-workaround

1. backspace-and-enter-workaround
2. Dependent merge proposals