Merge "Minor changes to the API to align the choice of password hashing algorithm" into pi-dev