Recover better from aggregator server network partitions

Change-Id: Ia54f5803dcdb03f757809d86e51bd486f0351a3e