Merge branch '2.6.1-dev-SOL002-VNFIndicator-API' into '2.6.1-dev'
SOL002 VNF Indicator - Implementation of deltas between v2.6.1 and v2.4.1 See merge request !91
SOL002 VNF Indicator - Implementation of deltas between v2.6.1 and v2.4.1 See merge request !91