Cypher fix for 2.x
Collected updates for 2.x migration
Fixes test failure via surefire configuration