Merge changes Ic4fa9f76,I66b41f8c

* changes:
  Change some strings to leafrefs in NSD model
  Remove extraneous element internal-connection-point