Merge branch 'release/7.x-0.30' into develop
#Bug 17442 if usernam is not set - get it from OUI
TODO .. logintype can also be nem_id
tagging version 7.x-0.31
Merge branch 'release/7.x-0.31'