JBTIS-73 - Updates for new ESB build