fixes after jenkins duty
CR fixes
Merge pull request #414 from Wikia/stability-fixes-for-preview

fixes after jenkins duty