ADEN-1054 fix conflict
Merge pull request #3355 from Wikia/aden-1054-sharethrough-is-hidden-mergable

ADEN-1054 fix conflict