Fix pluralization in RESTMapper when kind ends with 'y'
Merge pull request #2569 from mfojtik/pluralization_fix

Fix pluralization in RESTMapper when kind ends with 'y'