Merge branch '2.6.1-dev' into '2.6.1-dev-SOL002-VNFIndicator-API'
# Conflicts: # SOL002/VNFIndicator-API/VNFIndicators.robot # SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot
# Conflicts: # SOL002/VNFIndicator-API/VNFIndicators.robot # SOL002/VNFIndicator-API/VnfIndicatorsInVnfInstanceId.robot