Move Cirrus poolcounter settings to where they belong, update values to reflect production more

Change-Id: I47230a033d700f22621a3c6058c448891d83edaa
Merge "Move Cirrus poolcounter settings to where they belong, update values to reflect production more"