DATASOLR-175 - After release cleanups.