Merge proposals dependent on lp://staging/~gerboland/ubuntu-system-settings/sigstop-for-upstart

1. sigstop-for-upstart
2. Dependent merge proposals