Merge branch 'stable-3.3' * stable-3.3: Remove dependency on commons-io library Fix replication to retry on lock errors Change-Id: I52fea645ccb55c1380702c071f1c7f7f134dc1b2