Bug 915312 - pbkdf2 only

This goes on top of some m-c patches, to be pushed in a second.