KEYCLOAK-74 deprecated and invalid template fixes