Bugzilla – Dependency tree for Bug 684
Upgrade to upstream WAF 1.5.9 plus a bunch of 'waf tools' layered on top