Merge pull request #1583 from Wikia/DAR-2135-p2-fixes; backported from dev as a p2 fix

DAR-2135 P2 fix for related pages on a file page