Spring Boot upgrade fixes

This change adds some missing fixes resulting from the upgrade to
Spring Boot 1.0.0.RC3.