Merge branch...

Merge branch '65-fix-tests-based-on-service-status-update-when-a-resource-s-state-changes' into 'develop'

Resolve "Fix tests based on service status update when a resource's state changes"

See merge request !61