joining node/node_annotations as facts_node and rank/edge_annotation as facts_edge (again)

This is similar to the original splitfacts scheme but it still has the enhancements (combined annotation values, component type...) from the current work.