Use regex to handle ServiceDiscovery and Dashboard

Jira-issue: WP-984
Merge pull request #18 from aldafu/WP-984-add-dashboard-service-exception

Use regex to handle ServiceDiscovery and Dashboard