FYI, I had previously gotten all of the golden feathers, and when I finished the boat ride, I got another! So now I have 21 feathers. Maybe that's a bug? In any case, I have 21 feathers now. :-)