add str_and_salt2pbkdf2 for new couchdb hashing

couchdb defaults to PBKDF2 which has been supported since 1.3:
https://issues.apache.org/jira/browse/COUCHDB-1060