Update build requirements ahead of merging ES