|  | gitlab.iaik.tugraz.at:egiz/eaaf_components into feature/VT-21-016
# Conflicts:
#	eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
#	eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java |