Bug#901092: passwordsafe FTCBFS: multiple reasons

[Bill Blough]

Thanks for the patch.  I will apply it soon, and also forward the
relevant parts upstream.