Fixes #3245 - Rename all 'policyInstanceId' remaining into 'directiveId'
Merge pull request #52 from nperron/bug_3245/dev/remove_policy_instance_occurences

Fixes #3245 - Rename all 'policyInstanceId' remaining into 'directiveId'