Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev