yet more improvements to logging for BAC-691
Merge pull request #1421 from Wikia/BAC-691

Bac 691