Revert "Revert "Upgrade to xtext2.4 (again)""

This reverts commit 5143d0988ac79b32bce9a4dd7db4d395bc66a0ab.