* pull1120:
  Fix hystrix dashboard TPS.

fixes gh-1113

See https://github.com/Netflix/Hystrix/issues/1251

Eliminates a legacy use of a static singleton. This will help allow multiple registrations.

Updates so CloudJacksonJson extension is properly recognized by Eureka
Server as LegacyJacksonJson.

see gh-978
fixes gh-1111

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