Fix Image constraint class and validator link

Just a rebase of #3646...