Merge branch 'sg/lock-file-commit-error' into maint * sg/lock-file-commit-error: credential-store: don't pass strerror to die_errno()