Back port 4352707e to 1.3.x for compatibility with Spring Framework 4.3

[wilkinsona]

A user is hitting an NPE when trying to use Spring Framework 4.3 with Spring Boot 1.3: spring-attic/platform#414 (comment)

[philwebb]

@wilkinsona Did you mean to close this one?

[wilkinsona]

Nope! Thanks