VE-1280: Fix lint/hint related issues
Merge pull request #3999 from Wikia/VE-1280

VE-1280: Fix lint/hint related issues