in progress
Merge branch 'develop' into SWC-1460
with tests, and additional logging if set username fails
Merge pull request #1055 from jay-hodgson/SWC-1460

Swc-1460: If temporary username detected, send user to ChangeUsername place