Restored service-id tag

After the fix of the policy manager (WP-1141) it is
possible to use service-id tag instead of api-feature

Jira-issue: WP-1137