Merge branch 'trunk' into pinned-browser-updates

Author: navin772

java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java

@@ -257,6 +257,7 @@ public void canAddAndGetCookie() {
     assertThat(key.getUserContext()).isEqualTo("default");
   }
 
+  @NotYetImplemented(EDGE)
   @Test
   public void canGetAllCookies() {
     String key1 = generateUniqueKey();

javascript/selenium-webdriver/lib/proxy.js

@@ -156,6 +156,9 @@ function direct() {
  * @return {!ManualConfig} A new proxy configuration object.
  */
 function manual({ ftp, http, https, bypass }) {
+  if (ftp !== undefined) {
+    console.warn('ftpProxy is deprecated and will be removed in the future')
+  }
   return {
     proxyType: Type.MANUAL,
     ftpProxy: ftp,