Also update test Docker container so that LTS patches can be tested This patch cherry-picks 2 commits: a0f9b465 35e8e3f7