gflags 2.1 bugfix (or rather a hack).
fixing comment
lint
Merge pull request #812 from Yangqing/sweep

gflags 2.1 bugfix (or rather a hack).