Merge "Add host filtering for test_aggregate_add_existent_host and test_aggregate_remove_host_as_user tests"