BACKLOG-934 fix IdP keyword metadata import
Merge remote-tracking branch 'origin/BACKLOG-934' into develop