partial test fix
START PART 5: https://www.drupal.org/node/2301319
apply patch https://www.drupal.org/files/issues/menu-2256521-remove-dead-code.patch
and resolve conflicts with 8.x