Add defaults to the CLI help strings

This modifies the help strings for timeout, os-service-type, and
os-endpoint-type arguments, to include the default values used.

Change-Id: I6bc9c243654b74550c60caf7fdb40e18addb3cd4
Merge "Add defaults to the CLI help strings"