More finally closures, may help with #3434
Merge remote-tracking branch 'salt/develop'