fixed reporting error position in queries with newlines
adjusted test
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2