Merge proposals dependent on lp:~tribaal/landscape-client/fix-1429888-wrong-credentials-stacktrace

1. fix-1429888-wrong-credentials-stacktrace
2. Dependent merge proposals