Redmine #3260 and #3261 services fixes

Addresses https://cfengine.com/dev/issues/3260 and https://cfengine.com/dev/issues/3261