Adds short-term solution for enabling enrolment with self-signed PZHs

Jira-issue: WP-1283