Import gateway changes from fucked up branch
Import gateway changes from fucked up branch

This and the following commits will import stuff I did from GF's laptop.

mbj/axiom-arango-adapter,mbj/axiom-arango-adapter