DATAREST-374 - After release cleanups.