Bug 989814 - Minimize usage of hard coded hostname. r=dustin