DATAREST-337 - After release cleanups.