Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Fix formatting of documentation
  Remove unsused variable
  Allow blocking of usernames using wildcards and regex
  Add command to register existing user as service user

Change-Id: Ib9dfe4cac48acefd85a103a7241c2abbc9c2f675