Count resource gatherers also when returning their resources.

Followup on r24357 / rP24357.
This gives a better image of the amount of units which are gathering.
By decision, entities are _not_ accounted from when the player tasks them to return their resources.

Refs. #643
Differential revision: https://code.wildfiregames.com/D3226
Comments by: @wraitii