Use managed version of commons-io
Merge latest changes from master