buidbot changes from ibdsim to ibdsim2