Merge branch 'stable-3.1' * stable-3.1: ReplicationTasksStorage: Handle DirectoryIteratorExceptions Change-Id: Idcb01987a8f3226d971da82fd530bf09ca8ccfa7