Allow traditional datasources to apply to "devices" discovered via AWS integration.

We have deployed a collector in one of our AWS VPCs and added those instances via the AWS integration. Since the latest version of the beta has a "Cloud Collector" processing the data from the AWS API, we have to add these instances again as separate devices to get the traditional datasources.

It would be great to either to give us the ability to shift the AWS API collecting back to one of our collectors OR allow the "system" to know that these are the same device and to group the datasources together under one device.

Getting to correlate the AWS API data with traditional datasources would be a neat thing to show off to my manager.