Fixed bug in yubikey auth for old passwords.
Merge branch 'dev' into test
Reversed bad merge.
Merged and undo bad merge.