Add passwd opts checking to key_opts, fix #16147
fix bad naming
Merge pull request #16159 from thatch45/passwd_fix

Add passwd opts checking to key_opts
Merge branch '2014.7' into develop