Updated pom.xml so that mvn exec:java works again in server.
Ensure parse errors are propagated for badly escaped statements in server
Merge pull request #3228 from pontusmelke/fix-server

[2.2] Small fixes to server