[Configuration] CONFIGURATION-688 Including a property file moves locator to that file

[Gary Gregory]

Hi All:

I am looking for community feedback or opinions on
https://issues.apache.org/jira/browse/CONFIGURATION-688

Thank you,
Gary