DATAREST-378 - After release cleanups.