DAR-1896 | ImageService refactoring unit tests
Merge branch 'DAR-1714-and-1717' of github.com:Wikia/app into DAR-1714-and-1717