VE-1196: All conflicts solved and some problems solved, unit tests are not passing yet
Comment out method call instead of method content
Updates from investigating diff
 * Remove files no longer needed and not removed from patch
 * Resolve some remaining conflicts
Remove duplicate methods which resulted from bad merge
Update test directory path for Wikia
Remove references to removed classes and fix Wikia image nodes
Length should no longer be passed in to constructors due to this change:
https://github.com/wikimedia/VisualEditor-VisualEditor/commit/2587549269a233d48009aaa9ad6fc7d5aba08107
Fix focus mode
Pass target into the new call to DesktopSurface constructor
VE-1278: ve.ce.GeneratedContentNode: Remove 'setup' event handler to fix unit tests
VE-1278: Comment out tests that are not (/less) relevant to Wikia (and do not work)
VE-1278: Adjust test - this is actually reverting it to original (upstream) state
VE-1278: Fix language and message relatged tests
Merge pull request #3997 from Wikia/VE-1278

VE-1278
VE-1280: Fix lint/hint related issues
Merge pull request #3999 from Wikia/VE-1280

VE-1280: Fix lint/hint related issues
VE-1196: Minot jscs error fix
VE-1196: Fix problem with ve.ce.Document: getRelativeRange (mwBlockImage / mwInlineImage) test.

This fix is a port of upstream change that ensure that all tests are loaded in the top of the page (html) to avoid "weird" race conditions.
VE-1196: Use ve.test.utils.createSurfaceFromDocument to initialize surface (instead of standalone target)
VE-1196: Get all QUnit tests to pass
VE-1196: Address jscs issues
VE-1287: Fix for context menu not being shown. There are not $shields anymore, there are $highlights, however they work different than $shields used to. Fortunatelly there is a method getDimensions which we can use here, instead of measuring with jQuery .width() and .height()