Add appropriate aggregate filters

The cpu_allocation_ratio and disk_allocation_ratio settings were added
previously, but do not take effect unless the matching filters are
applied.

(cherry picked from commit d6c73328765a663376b878fd390ea66585de64dc)
Merge pull request #317 from nrb/stable/icehouse

Add appropriate aggregate filters