[keycloak-dev] Git History w/merges of upstream/master