Merge "BUG-2512: get rid of commons-io"