Really fix property file loading this time

The context:property-placeholder config element does not work as
intended. See https://jira.spring.io/browse/SPR-9989.
Merge branch 'java-sec-config' into integration