Merge branch 'dev' of github.com:Wikia/app into dev
Merge branch 'dev' of github.com:Wikia/app into dev
Merge branch 'dev' of github.com:Wikia/app into dev
Only override dev box image URLs if vignette is disabled

Only override dev box image URLs if vignette is disabled. That is don't
respect DevBoxImageServerOverride if EnableVignette is set to true.
Cleanup logic. Add test.

Cleaned up the logic. Added a test.
Merge pull request #5115 from Wikia/bind-wgDevBoxImageServerOverride-to-wgEnableVignette

Only override the dev box image server if Vignette is disabled