Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: ReplicationTasksStorage: Add unit tests Change-Id: Ic4d28918223e8b4f3b0d8a83b1c987be22d8db45