Merge branch 'dev' into DAR-112
DAR-112 Fixed unit tests to account for changes from #737 and #864.
DAR-112 Comments to make it easier to find tests that are failing.
Merge pull request #878 from Wikia/DAR-112

Fix for failed builds in Jenkins