Be defensive about resolving properties in PropertySourcesPropertyValues
Merge branch '1.1.x'