Merge changes I0ef708ab,I81d27fd4 into stable-3.1 * changes: Move shouldCleanupTasksAfterNewProjectReplication test Merge branch 'stable-3.0' into stable-3.1