TINKERPOP-3056 Follow-on fix for mid-traversal mergeE/V

Prevents child traversals to option() from having an Element in it so that you can't mistakenly update the wrong thing CTR
11 files changed