Bug 836524 - Zone renaming part 1 (r=terrence)
Bug 836524 - Zone renaming part 2 (r=jonco)
Bug 836524 - Zone renaming part 3 (r=jonco)
Bug 836524 - Zone renaming part 4 (r=terrence)
Bug 836546 - Simplify gray links in the GC (r=jonco)
Bug 836524 - Zone renaming part 5 (r=jonco)
Bug 836524 - Zone renaming part 6 (r=jonco)