case 4133 - Force image campaign to require image and link.
Merge branch 'case-4133' into develop