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

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