Merge "Add submodule-timeout for submodule operations"