MAIN-2681-fix php warnings
MAIN-2681 CR fixes
Merge pull request #4373 from Wikia/MAIN-2681

MAIN-2681-fix php warnings