remove trailing ; in the macros, so the compiler will require them in the usage places.
 - fix context scope usage
 - revert moving of trycatch in some places.
Merge branch 'v8-upgrade' of github.com:triAGENS/ArangoDB into v8-upgrade