DATASOLR-183 - After release cleanups.