Merge pull request #7344 from mbien/cv-skip-sporadically-failing-template_delivery

CV: skip sporadically failing template delivery