Bug 1110420: need to not do geo-specific defaults for distribution builds. r=markh, a=gavin

--HG--
extra : transplant_source : %160%80%20%9C%A9%7B%60%9D%E6%B7%24mD%07%8E%21by%15