Merge "Make test 044-proxy less flaky"