Thank you for applying the changes @shadab-geo, that says:
I'm not 100% comfortable with the changes we are pushing, for example, the way we are setting up the proxy host looks too clumsy to me, why not use the method described HERE using default proxy planner?
Doing these things without integration tests or manual tests is less than ideal, we need to find a way to test this, maybe using docker?
To avoid blocking everyone, I'm going to merge this, but I have created THIS issue so we can fix things properly.