Merge remote-tracking branch 'origin/master' into feature/BACKLOG-826
Added disable consent to entity metadata
Added janus patch
Remove name id format emailAddress, it should by supported by Engine Block first
Name id format unspecified is now available in both correct 1.1 and incorrect 2.0 version
Merge branch 'feature/BACKLOG-826'
Merge branch 'feature/BACKLOG-860'