Clarify the use of spring.profiles

Fixes gh-1470
Merge branch '1.1.x'