Ok, we've fixed the problems that Pasha was seeing, and seem to be
clear to bring the cpc3 work back to the trunk tonight.
We will still have oob/xoob be the default -- ibcm and rdmacm will
[currently] fire only if specifically requested because there's still
a little work to do in these two cpc's before they're done.