Doctrine 2 - ORM

[GH-485] Back ported changes of SimpleConditionalExpression