DATASOLR-165 - After release cleanups.