Merge "Add configuration for default timeout to dock user" into tm-qpr-dev