Merged from trunk rev.14189

diff --cc configure.ac
Simple merge

diff --cc src/clients/FtpGateway.cc
Simple merge

diff --cc test-suite/squidconf/regex
index c22427a8695499ac35b120aedb80967428756494,3f85acca39c142c95d489c81d34bb455e238c4aa..569968bdfeddb93416d2082a7169f68677c13ce2
--- 1/test-suite/squidconf/regex
--- 2/test-suite/squidconf/regex
+++ b/test-suite/squidconf/regex
@@@ -19,13 -19,6 +19,13 @@@ acl G dstdom_regex \.g...le\.com
  acl B browser ^Mozilla
  acl B browser ^Java/[0-9]+(\.[0-9]+)?
  
- 
- # invalid pattern - this whold abort
 +# double-quotes 'regression' from GNU regex library
 +refresh_pattern "foo 0 80% 20160
 +refresh_pattern ["] 0 80% 20160
 +refresh_pattern "foo\" 0 80% 20160
 +refresh_pattern "foo["] 0 80% 20160
 +refresh_pattern foo\" 0 80% 20160
 +
+ # invalid pattern - this should ERROR
  acl foo browser *
+