We used the -t argument only for the VSM attach, not for the actual CLI
operations.

I do not think the complication of differentiated timeouts is justified,
so just use the one timeout parameter we have for both. Also I think
that the documentation is already adequate in its simplicity:

       -t timeout
              Wait no longer than this many seconds for an operation to
              finish.

Fixes #3542