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

MAIN-2681 fix php warnings