CSV-124 apply provided patch and update unit tests

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1624048 13f79535-47bb-0310-9956-ffa450edef68
CSV-124 update changes

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