API - get_service_instances now returns a complete instance object
Import in the UI now supports a global Conflict option.