Fix merge issue that removed all staff from developer branch :-).
Undo my stupid mistake (I have pushed issue-957 to master instead of develop). Do I have copied files from GitHub master and push them back..
refs #988: Added support for onetime passwords