Merge pull request #784 from jay-hodgson/release-27

SWC-1154:  username view hidden on logout (login/logout ui visible).  also pass back message to client if open id fails
Merge pull request #785 from jay-hodgson/release-27

SWC-1155: re-login after setting password.  send to the login page if anything is wrong with credentials
SWC-1146: missed a case where userprofile.email was referenced