Can we combine the work going on for builds in master and maven-waf?

[Chip Childers]

Can we combine the work going on for builds in master and maven-waf?

At this point, I'm personally confused about which branch (master of
maven-waf) is the one that we are all looking at to stabilize the
build.

Should we pick one?

-chip