Merge proposals dependent on lp://staging/~zeller-benjamin/ubuntu-sdk-ide/fix_ap_and_dev_shell

1. fix_ap_and_dev_shell
2. Dependent merge proposals