Merge pull request #469 from stianst/master

KEYCLOAK-532
Merge pull request #470 from stianst/master

KEYCLOAK-530
Merge pull request #471 from stianst/master

KEYCLOAK-533