Improve the implementation of the #15400 bugfix

See #15400-note_14 and follow ups.

Feature Branch: bug/15400-python-lib-breaks-reproducibility

Original created by @intrigeri on 15421 (Redmine)

Edited Nov 22, 2019 by intrigeri

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information