JBTIS-223 - Build fixes for ESB