Clean up and update dependencies

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