temp/eg25-manager: build master branch, drop merged patches

I believe everything here has been merged in master, so let's build that for now (since it includes at least 1 additional fix not in the patches that were dropped here)

cc @dylanvanassche