Merge branch 'master' into 'samba-master-patch-38223'

# Conflicts:
#   roles/rt4/templates/rt4.pm.j2

roles/rt4/templates/rt4.pm.j2

 # Set the Organization name and our public URL.
 Set($rtname, '{{ helpdesk_app_name }}');
+Set($WebBaseURL , 'https://helpdesk.autistici.org');
 Set($LogoLinkURL , 'https://helpdesk.autistici.org/rt/');
 Set($Organization, '{{ helpdesk_organization }}');
 Set($WebDomain, 'helpdesk.autistici.org);