Fix a bug with a new plan and insert a catch.
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2