Ability to distinguish between multiple privacy policy negotiations, redmine #1468
Merge branch 'eliza_privacy_1673' into development