bug 986990: Modify test channel names to support releases on Balrog - support new test channel substitutions; use local test channel for update verify. r=nthomas
Fix buildbotcustom tests after changes from bug 986990.
Merging from default

changeset:   3860:fd771573e0d8
parent:      3857:c50486d1c856
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Thu Sep 18 09:19:04 2014 -0400
summary:     bug 986990: Modify test channel names to support releases on Balrog - support new test channel substitutions; use local test channel for update verify. r=nthomas

changeset:   3862:31f217b2a0d7
parent:      3860:fd771573e0d8
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Thu Sep 18 09:52:05 2014 -0400
summary:     Fix buildbotcustom tests after changes from bug 986990.

--HG--
branch : production-0.8