v4.0.16
Merge pull request from GHSA-x9vc-6hfv-hg8c
2017 -> 2018
Fix logic typos
Fix password auth for 4.0 (#5708)