Additional style fixes on code merged from #1160.
Additional style fixes on code merged from #1160.

gdseller/flot,matong/flot,chaveiro/flot,saike/flot,resnick1223/flot,stanislavdavid/flot,flot/flot,mcanthony/flot,MAMISHO/flot,k-joseph/flot,colinhunt/flot,resnick1223/flot,stanislavdavid/flot,mlitwiniuk/flot,pepperdata/flot,mlitwiniuk/flot,chiu/flot,andig/flot,cipix2000/flot,chiu/flot,sedran/flot,stanislavdavid/flot,saike/flot,petrvacha/flot,kongx73/flot,cipix2000/engineering-flot,lolifans/flot,klarkc/flot,mlitwiniuk/flot,andig/flot,octavianCraciun/engineering-flot,saike/flot,soenter/flot,TrainingPeaks/flot,k-joseph/flot,chiu/flot,cipix2000/flot,soenter/flot,resnick1223/flot,chaveiro/flot,Sensirion/flot,chaveiro/flot,fashionsun/flot,ni-kismet/engineering-flot,magora-suchkov/flot,k-joseph/flot,andig/flot