Merge pull request #4186 from Wikia/VID-1834-liz

VID-1834 alternative solution for ensuring files with link= navigate to ...