Revert "Manage aggregator instances through upstart directly"

Puppet doesn't allow specifying env variables for instances

This reverts commit 1f1dae0eac8e8b4ea5ecde8261c8d6b0bd942919

Change-Id: I19519a78401fdd7aa7f1c395b3e1f46c0cf22bba
Merge "Revert "Manage aggregator instances through upstart directly"" into production