AverageByComponent small improvements. Refs #2710
Merge branch 'feature/2710_average_tube' into develop