[kubernetes#2569] Fix pluralization in RESTMapper when kind ends with 'y'