Merge branch '17-check-service-status-update-based-on-resource-state' into 'develop'
Resolve "Check service status update based on resource state" See merge request !21
Resolve "Check service status update based on resource state" See merge request !21