Refactored, bindings and poms fixed for new JNDI names of DataBroker components