BISERVER-10378 - Fixes for serialization in datasource catalog service