Backport of cli: Restore -lock and -lock-timeout init flags into v1.0#29780

alisdair merged 1 commit intov1.0hashicorp/terraform:v1.0from

backport/alisdair/init-lock-flags/oddly-healthy-harehashicorp/terraform:backport/alisdair/init-lock-flags/oddly-healthy-hareCopy head branch name to clipboard