cherry-picks from master to 2.0 to make 2.0.6 release
and converted SEGYExport and SEGYImport to have the --json-output flag
Starting on April 8th, The Open Group will require Two Factor Authentication for all GitLab users. For instructions on setting up 2FA, see the Knowledge Article or GitLab Documentation. Note in particular that any HTTPS clones will require the use of a Personal Access Token (rather than a user’s password) once 2FA is enabled.
and converted SEGYExport and SEGYImport to have the --json-output flag