Jbtis 223 - Build updates for ESB