Merge topic 'timestamp-timezone'

9da542d5c1 string(TIMESTAMP): Add %z and %Z for adding time zone string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7788