Change the way the 'OPTIONAL MATCH' has to be generated
Add tests for the new optinal match implementation
Merge remote-tracking branch 'petitphilou/master'