PIM-2854: Clean DatasourceSupportResolver