Merge "Temp workaround for 502 error for jenkins systest"