Merge branch 'stable-3.1' into 'stable-3.1'
XMPP Server Setup bugfix for 3.1 Content: - replaced old dev default values in dns generation for XMPP domains by server name - added datalog tokens for xmpp domains and users - fixed DB query for XMPP authentication and user query - added default values for all CSR fields, so they cannot be empty There is still a new error with the authentication. The Auth script used to authenticate against the database should be spawned in its own process, but the auth module seems not to load it. Maybe it is a problem with new library versions released during the last year. I'm in contact with the metronome Devs to solve this problem. In meantime, this bugfix will ensure that the servers are configured correctly. See merge request !471