[COLLECTIONS-312] Apply remaining changes from patch.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1443602 13f79535-47bb-0310-9956-ffa450edef68