Allow usernames to end in a digit.
Merge remote-tracking branch 'refs/remotes/ivan/bug/allow-usernames-ending-with-digit' into develop
Fix method names.
Remove unused code.
Refactor cleanup, ProviderConfig to backend.
Refactor cleanup and move Keymanager to backend.
Add changes file for #5698 and #5711.
Merge remote-tracking branch 'refs/remotes/ivan/feature/cleanup-backend-from-hacks' into develop
Properly set userid for SMTP
Merge remote-tracking branch 'chiiph/bug/fix_setting_userid' into develop
comment logs for waiting state
working restarts
refactor eip start/stop control to conductor

and cleanup a little bit of the signal mess.
fix merge error