DATASOLR-213 - After release cleanups.