This commit will merge the Aggregate plugin into mainline. ToDo, remove old Aggregate plugin registration for those who have installed it previously, and testing of upgrade process.
