Bug 942167: Enable nonunified builds on all branches for linux64 opt/debug r=rail
bug 948744 - fix test-masters.sh by killing wasabi try. r=callek