More changes for gap junctions in NML2 comp type defs & in schema. Subject to change