MDL-66118 hub: Stop using the hub URL as the setting name suffix