Remove override that caused database connections to be consumed
when calling local services
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x