DATAREST-361 - After release cleanups.