CORE-2075 generateChangelog generates bad definition for TIME type
(cherry picked from commit 9603e33)
Merge remote-tracking branch 'origin/3.2.x' into 3.2.x