Merge pull request #6920 from nupplaphil/feature/basepath/hostname_config