Fix compatibility with the tasks postponed to sonar 3.6