diff -r -c -N Ice-3.5.1-origin/cpp/demo/Ice/multicast/config.client Ice-3.5.1/cpp/demo/Ice/multicast/config.client
*** Ice-3.5.1-origin/cpp/demo/Ice/multicast/config.client	2013-10-04 17:48:14.000000000 +0200
--- Ice-3.5.1/cpp/demo/Ice/multicast/config.client	2014-04-22 19:36:23.343651650 +0200
***************
*** 15,21 ****
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Proxy=discover:udp -h "ff01::1:1" -p 10000
  #DiscoverReply.Endpoints=tcp -h "::1"
  
  #
--- 15,21 ----
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Proxy=discover:udp -h "ff05::2" -p 10000
  #DiscoverReply.Endpoints=tcp -h "::1"
  
  #
diff -r -c -N Ice-3.5.1-origin/cpp/demo/Ice/multicast/config.server Ice-3.5.1/cpp/demo/Ice/multicast/config.server
*** Ice-3.5.1-origin/cpp/demo/Ice/multicast/config.server	2013-10-04 17:48:14.000000000 +0200
--- Ice-3.5.1/cpp/demo/Ice/multicast/config.server	2014-04-22 19:36:30.655651965 +0200
***************
*** 14,20 ****
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Endpoints=udp -h "ff01::1:1" -p 10000
  #Hello.Endpoints=tcp -h "::1"
  
  #
--- 14,20 ----
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Endpoints=udp -h "ff05::2" -p 10000
  #Hello.Endpoints=tcp -h "::1"
  
  #
diff -r -c -N Ice-3.5.1-origin/cpp/test/Ice/udp/AllTests.cpp Ice-3.5.1/cpp/test/Ice/udp/AllTests.cpp
*** Ice-3.5.1-origin/cpp/test/Ice/udp/AllTests.cpp	2013-10-04 17:48:14.000000000 +0200
--- Ice-3.5.1/cpp/test/Ice/udp/AllTests.cpp	2014-04-22 19:34:40.099647203 +0200
***************
*** 141,147 ****
  #if defined(__APPLE__)
          endpoint = "udp -h \"ff02::1:1\" -p 12020 --interface \"lo0\"";
  #else
!         endpoint = "udp -h \"ff01::1:1\" -p 12020";
  #endif
      }
      else
--- 141,147 ----
  #if defined(__APPLE__)
          endpoint = "udp -h \"ff02::1:1\" -p 12020 --interface \"lo0\"";
  #else
!         endpoint = "udp -h \"ff05::2\" -p 12020";
  #endif
      }
      else
diff -r -c -N Ice-3.5.1-origin/cpp/test/Ice/udp/Server.cpp Ice-3.5.1/cpp/test/Ice/udp/Server.cpp
*** Ice-3.5.1-origin/cpp/test/Ice/udp/Server.cpp	2013-10-04 17:48:14.000000000 +0200
--- Ice-3.5.1/cpp/test/Ice/udp/Server.cpp	2014-04-22 19:34:53.267647770 +0200
***************
*** 43,49 ****
  #if defined(__APPLE__)
          endpoint = "udp -h \"ff02::1:1\" -p 12020 --interface \"lo0\"";
  #else
!         endpoint = "udp -h \"ff01::1:1\" -p 12020";
  #endif
      }
      else
--- 43,49 ----
  #if defined(__APPLE__)
          endpoint = "udp -h \"ff02::1:1\" -p 12020 --interface \"lo0\"";
  #else
!         endpoint = "udp -h \"ff05::2\" -p 12020";
  #endif
      }
      else
diff -r -c -N Ice-3.5.1-origin/cs/demo/Ice/multicast/config.client Ice-3.5.1/cs/demo/Ice/multicast/config.client
*** Ice-3.5.1-origin/cs/demo/Ice/multicast/config.client	2013-10-04 17:48:15.000000000 +0200
--- Ice-3.5.1/cs/demo/Ice/multicast/config.client	2014-04-22 19:37:13.703653819 +0200
***************
*** 15,21 ****
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Proxy=discover:udp -h "ff01::1:1" -p 10000
  #DiscoverReply.Endpoints=tcp -h "::1"
  
  #
--- 15,21 ----
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Proxy=discover:udp -h "ff05::2" -p 10000
  #DiscoverReply.Endpoints=tcp -h "::1"
  
  #
diff -r -c -N Ice-3.5.1-origin/cs/demo/Ice/multicast/config.server Ice-3.5.1/cs/demo/Ice/multicast/config.server
*** Ice-3.5.1-origin/cs/demo/Ice/multicast/config.server	2013-10-04 17:48:15.000000000 +0200
--- Ice-3.5.1/cs/demo/Ice/multicast/config.server	2014-04-22 19:37:20.735654122 +0200
***************
*** 14,20 ****
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Endpoints=udp -h "ff01::1:1" -p 10000
  #Hello.Endpoints=tcp -h "::1"
  
  #
--- 14,20 ----
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Endpoints=udp -h "ff05::2" -p 10000
  #Hello.Endpoints=tcp -h "::1"
  
  #
diff -r -c -N Ice-3.5.1-origin/cs/test/Ice/udp/AllTests.cs Ice-3.5.1/cs/test/Ice/udp/AllTests.cs
*** Ice-3.5.1-origin/cs/test/Ice/udp/AllTests.cs	2013-10-04 17:48:15.000000000 +0200
--- Ice-3.5.1/cs/test/Ice/udp/AllTests.cs	2014-04-22 19:35:55.759650462 +0200
***************
*** 189,195 ****
              }
              else
              {
!                 endpoint = "udp -h \"ff01::1:1\" -p 12020";
              }
          }
          else
--- 189,195 ----
              }
              else
              {
!                 endpoint = "udp -h \"ff05::2\" -p 12020";
              }
          }
          else
diff -r -c -N Ice-3.5.1-origin/cs/test/Ice/udp/Server.cs Ice-3.5.1/cs/test/Ice/udp/Server.cs
*** Ice-3.5.1-origin/cs/test/Ice/udp/Server.cs	2013-10-04 17:48:15.000000000 +0200
--- Ice-3.5.1/cs/test/Ice/udp/Server.cs	2014-04-22 19:36:03.331650788 +0200
***************
*** 53,59 ****
              }
              else
              {
!                 endpoint = "udp -h \"ff01::1:1\" -p 12020";
              }
          }
          else
--- 53,59 ----
              }
              else
              {
!                 endpoint = "udp -h \"ff05::2\" -p 12020";
              }
          }
          else
diff -r -c -N Ice-3.5.1-origin/java/config/build.properties Ice-3.5.1/java/config/build.properties
*** Ice-3.5.1-origin/java/config/build.properties	2013-10-04 17:48:15.000000000 +0200
--- Ice-3.5.1/java/config/build.properties	2014-04-22 19:39:44.775660327 +0200
***************
*** 13,19 ****
  # Oracle Berkeley DB version, only needed if you want to build
  # Freeze.
  #
! db.version = 5.3.21
  
  #
  # Version of Jgoodies components to use, only needed if you want
--- 13,19 ----
  # Oracle Berkeley DB version, only needed if you want to build
  # Freeze.
  #
! db.version = 5.3.28
  
  #
  # Version of Jgoodies components to use, only needed if you want
diff -r -c -N Ice-3.5.1-origin/java/demo/Ice/multicast/config.client Ice-3.5.1/java/demo/Ice/multicast/config.client
*** Ice-3.5.1-origin/java/demo/Ice/multicast/config.client	2013-10-04 17:48:15.000000000 +0200
--- Ice-3.5.1/java/demo/Ice/multicast/config.client	2014-04-22 19:36:53.015652928 +0200
***************
*** 15,21 ****
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Proxy=discover:udp -h "ff01::1:1" -p 10000
  #DiscoverReply.Endpoints=tcp -h "::1"
  
  #
--- 15,21 ----
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Proxy=discover:udp -h "ff05::2" -p 10000
  #DiscoverReply.Endpoints=tcp -h "::1"
  
  #
diff -r -c -N Ice-3.5.1-origin/java/demo/Ice/multicast/config.server Ice-3.5.1/java/demo/Ice/multicast/config.server
*** Ice-3.5.1-origin/java/demo/Ice/multicast/config.server	2013-10-04 17:48:15.000000000 +0200
--- Ice-3.5.1/java/demo/Ice/multicast/config.server	2014-04-22 19:36:46.127652631 +0200
***************
*** 14,20 ****
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Endpoints=udp -h "ff01::1:1" -p 10000
  #Hello.Endpoints=tcp -h "::1"
  
  #
--- 14,20 ----
  # Alternative IPv6 configuration
  #
  #Ice.IPv6=1
! #Discover.Endpoints=udp -h "ff05::2" -p 10000
  #Hello.Endpoints=tcp -h "::1"
  
  #
diff -r -c -N Ice-3.5.1-origin/java/test/Ice/udp/AllTests.java Ice-3.5.1/java/test/Ice/udp/AllTests.java
*** Ice-3.5.1-origin/java/test/Ice/udp/AllTests.java	2013-10-04 17:48:15.000000000 +0200
--- Ice-3.5.1/java/test/Ice/udp/AllTests.java	2014-04-22 19:35:30.279649364 +0200
***************
*** 153,159 ****
              }
              else
              {
!                 endpoint = "udp -h \"ff01::1:1\" -p 12020";
              }
          }
          else
--- 153,159 ----
              }
              else
              {
!                 endpoint = "udp -h \"ff05::2\" -p 12020";
              }
          }
          else
diff -r -c -N Ice-3.5.1-origin/java/test/Ice/udp/Server.java Ice-3.5.1/java/test/Ice/udp/Server.java
*** Ice-3.5.1-origin/java/test/Ice/udp/Server.java	2013-10-04 17:48:15.000000000 +0200
--- Ice-3.5.1/java/test/Ice/udp/Server.java	2014-04-22 19:35:18.559648859 +0200
***************
*** 61,67 ****
              }
              else
              {
!                 endpoint = "udp -h \"ff01::1:1\" -p 12020";
              }
          }
          else
--- 61,67 ----
              }
              else
              {
!                 endpoint = "udp -h \"ff05::2\" -p 12020";
              }
          }
          else