Merge branch 'feat/110-cttc-incorrect-endpoint-lookup-in-nbi-etsi-bwm-plugin' into 'develop'

Resolve "(CTTC) Incorrect endpoint lookup in NBI ETSI BWM plugin"

See merge request !196