DATASOLR-157 - After release cleanups.