Fixed requestor-id extraction

Jira-issue: WP-1222
Merge pull request #60 from ccameroni/WP-1222-fix-requestor-id-interception

WP-1222 Fixed requestor-id extraction