DMAAP-1544 - Amend versions of buscontroller merge