Backport CONFIGURATION-534 from r1457498,


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/configuration/branches/CONFIGURATION_1_X_MAINTENANCE@1534396 13f79535-47bb-0310-9956-ffa450edef68