Merge remote-tracking branch 'origin/master' into hookshot

group_vars/matrix_servers

@@ -1522,6 +1522,8 @@ matrix_nginx_proxy_systemd_wanted_services_list: |
     +
     (['matrix-bot-go-neb.service'] if matrix_bot_go_neb_enabled else [])
     +
+    (['matrix-etherpad.service'] if matrix_etherpad_enabled and matrix_dimension_enabled else [])
+    +
     (['matrix-hookshot.service'] if matrix_hookshot_enabled else [])
   }}