Spring Cloud upgrade

This change upgrades Spring Cloud to 0.9.5.
Merge branch 'spring-cloud-upgrade'