Remove duplicate definition issue with labs ganglia

Change-Id: I56fa957ca5789f355f20edf39f8cdf2747c4d57a
Merge "Remove duplicate definition issue with labs ganglia" into production