Backport CONFIGURATION-555 from r1527396.



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