Always include user-provided service-instances
Bumping to version 4.0.4.rc1.