Updating waf tools to support bundle use master