Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: ReplicationTasksStorage: Add unit tests Change-Id: I8095d012b5cfa497267b6ef027f697c7e8369533