DATASOLR-190 - After release cleanups.