[1.5.x] Fixed #18144 -- Restored compatibility with SHA1 hashes with empty salt.

      Thanks dahool for the report and initial version of the patch.

Backport of 633d8de from master.