Merge topic 'correct_more_diy2_warnings'

f4a96cf1 Correct warning in StorageBasic logging when using 32bit ids.
28128429 Merge branch 'upstream-diy' into correct_more_diy2_warnings
3c130d16 diy 2019-01-09 (149953b0)

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