Merge pull request #1881 from docker/revert-1868-fix-error-in-restore-ep

Revert "Fixes bug that mistook gw6 for gw."

libnetwork/endpoint_info.go

@@ -413,7 +413,7 @@ func (epj *endpointJoinInfo) UnmarshalJSON(b []byte) error {
 		return err
 	}
 	if v, ok := epMap["gw"]; ok {
-		epj.gw = net.ParseIP(v.(string))
+		epj.gw6 = net.ParseIP(v.(string))
 	}
 	if v, ok := epMap["gw6"]; ok {
 		epj.gw6 = net.ParseIP(v.(string))