don't hijack image links (bug 43539)

also restrict to beta - this shouldn't have leaked into non-beta

Change-Id: I0823376c24d9807a8d50ab225f90a2281f6dbc86
Merge "don't hijack image links (bug 43539)"