Please cherry-pick:

Please cherry-pick:
- e.g. lockUserAccount() changes userAccountStatus to LOCKED which results in
  Objects.equals() to return false even when it is the same user which causes
  an exception being thrown.
- checking the userId only won't be enough for an other use-case where a new
  user with same data is being created

Signed-off-by: Roland Häder <roland@mxchange.org>