BISERVER-10378 - Fixes for serialization in datasource catalog service
Merge pull request #327 from pminutillo/5.1-sandbox

BISERVER-10378 - Fixes for serialization in datasource catalog service