pulling in changes in CbcInterface and Definitions from Dev