Improve connection pool configurability

Bug: 68534
Change-Id: Iddafd2bb9e90824757cd71da3e2649585404a79d