server: fix for wrong affinity group count#4154

yadvr merged 2 commits intoapache:4.13apache/cloudstack:4.13from

shapeblue:fix-affinity-group-api-countshapeblue/cloudstack:fix-affinity-group-api-countCopy head branch name to clipboard