Updating waf to support the bundle_use_master option for dependencies
Merge with master