Backport locator.hostname config option to v0.11 branch