[PATCH 2/2] Use space instead of underscore when user uses the timezone name (#924352)