Merge "Sonar fixes - AggregateVnfSearchProvider"