Merge pull request #8702 from diizzyy/samba4-urls