Merge "Adjust DFC tests to use FTPES instead of FTPS"