Merge branch 'stable-3.3'

* stable-3.3:
  Remove dependency on commons-io library
  Fix replication to retry on lock errors

Change-Id: I52fea645ccb55c1380702c071f1c7f7f134dc1b2
tree: a0cf012f320e28a75c1bd0b34e65a2d05a1e0a84
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE