Merge branch 'stable-3.3' * stable-3.3: ReplicationTasksStorage: Handle empty task files Change-Id: Iccc9dbfa44950310327d1602570f868755f96cc4