VID-1426 Move check for namespaces inside of hooks
Merge branch 'VID-1426' of github.com:Wikia/app into VID-1426