Merge pull request #2229 from hashicorp/b-generate-root-output

Fix generate-root help and progress output.

command/generate-root.go

@@ -267,7 +267,7 @@ func (c *GenerateRootCommand) dumpStatus(status *api.GenerateRootStatusResponse)
 	statString := fmt.Sprintf(
 		"Nonce: %s\n"+
 			"Started: %v\n"+
-			"Rekey Progress: %d\n"+
+			"Generate Root Progress: %d\n"+
 			"Required Keys: %d\n"+
 			"Complete: %t",
 		status.Nonce,
@@ -316,7 +316,7 @@ Usage: vault generate-root [options] [key]
 
 General Options:
 ` + meta.GeneralOptionsUsage() + `
-Rekey Options:
+Generate Root Options:
 
   -init                   Initialize the root generation attempt. This can only
                           be done if no generation is already initiated.