Replace deprecated Gremlin query in aai-common