[core] Make commit.max-retries behave as it means (#4641)

[core] Make commit.max-retries behave as it means (#4641) #12571