Update master branch to next major release
[DS-1744] Upgrade to latest log4j