Upgraded to Spring Cloud 1.1.0.
Merge branch 'master' into json