DATASOLR-132 - fix cyclic package dependency