Bug 1085112 - Update Thunderbird builders for mozilla_dir removal after merges. r=nthomas