Merge proposals dependent on lp://staging/~bigkevmcd/landscape-client/bug-710621-exit-more-gracefully

1. bug-710621-exit-more-gracefully
2. Dependent merge proposals