Merge pull request #3415 from bensze01/zeroize-2.16

[Backport 2.16] Remove hardcoded line number from the zeroize test