DATAREST-297 - After release cleanups.