Conflicts:
	spring-cloud-netflix-dependencies/pom.xml

It isn't very helpful to have a Collection converted to a String
anyway. We need to implement something new in Feign to apply
the converter (expander) to individual elements in the collection
but this change should get back to the old behaviour with
List<String> at least.

Fixes gh-1115

Upgrade to zuul 1.2.2

fixes gh-1091
closes gh-958

fixes gh-1110

fixes gh-1110

fixes gh-1087

* fix-query-string-in-class-requestmapping:
  Support path parms in Class @RequestMapping for feign

This commit adds the support to SpringMvcContract for path parameters
defined in the class' @RequestMapping Annotation that is applied to all
methods of a feign interface.

fixes gh-1023

Fixes gh-936

Fixes gh-1084

* Added missing error code for SimpleHostRoutingFilter
* Added missing error code for RibbonRoutingFilter

fixes gh-1051