Fix Spring Batch tests following upstream changes related to Spring Batch issue 4130. Closes gh-32237