[CDF-424]: fixed bug where generic extensionPoints were overriding more specific ones

@pamval @dcleao please review