Merge "De-flake and refactor FtpURLConnectionTest"