DATAREST-418 - After release cleanups.