update waf to support the bundle_use_master option