KEYCLOAK-74 deprecated and invalid template fixes
Merge pull request #43 from vrockai/KEYCLOAK-74

KEYCLOAK-74 deprecated and invalid template fixes