[DS-1606] Bring dspace-solr up-to-date with current development environment