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