Merge branch...
Merge branch '14-modify-the-way-the-status-of-a-service-in-inventory-is-determined-when-a-supporting-resource' into 'develop' Resolve "Modify the way the status of a Service in inventory is determined when a supporting resource changes status" See merge request !9