ADEN-1133 Fix duplicate assets in AssetManager
Merge pull request #3503 from Wikia/aden-1133-fix-duplicate-assets

ADEN-1133 Fix duplicate assets in AssetManager