PLINK-487: clean up
Merge pull request #328 from anilsaldhana/master

PLINK-487: clean up
Merge pull request #329 from pedroigor/master

[PLINK-489] - Support User Stereotypes in Credential API.