JBDS-2448 - Updated ESB version messages and fix