Specify a 20 connections limit for test

Change-Id: I9e8fdd5d7d13d9a2408cc9091a4f25b27c52da21
Merge "Specify a 20 connections limit for test" into production