Split ServiceInstance into Managed and UserProvided. Construction of ServiceInstance uses CC field 'type' to determine correct class
Bumping to version 4.0.4.rc2.