DATASOLR-183 - Remove usage of deprecated api from sd-commons.