Fix more bugs.
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
Make it compile again.
Disable variable bounds to let tests run again.