Merge remote-tracking branch 'origin/2.0.x' into 2.0.x

docs/src/main/asciidoc/spring-cloud-netflix.adoc

@@ -1455,7 +1455,7 @@ the service-specific prefix from individual routes, e.g.
       stripPrefix: false
 ----
 
-NOTE:  `zuul.stripPrefix` only applies to the prefix set in `zuul.prefix`.  It does have any effect on prefixes
+NOTE:  `zuul.stripPrefix` only applies to the prefix set in `zuul.prefix`.  It does not have any effect on prefixes
 defined within a given route's `path`.
 
 In this example, requests to "/myusers/101" will be forwarded to "/myusers/101" on the "users" service.