DATASOLR-177 - After release cleanups.