Merged changes from trunk to branch.

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