[1.6.x] Fixed documentation of make_password kwargs.

Backport of ed7c4df1ee from master