Add spring-boot-configuration-metadata to the definition
Merge branch '1.1.x'