Merge pull request #1166 from bcwaldon/override-usage

etcd: correctly override flag.Usage

main.go

@@ -91,7 +91,7 @@ func init() {
 }
 
 func main() {
-	flag.CommandLine.Usage = usageWithIgnoredFlagsFunc(flag.CommandLine, deprecated)
+	flag.Usage = usageWithIgnoredFlagsFunc(flag.CommandLine, deprecated)
 	flag.Parse()
 
 	setFlagsFromEnv()