"Idle warrior button" doesn't get all idle warriors

[Erik Johansson]

When I press the idle warrior button to cycle through the idle warriors I only seem to be able to get to some of the idle warriors. As far as I can tell from some quick testing it could have something to do with the naming change from super units to champion units? I'll investigate further, but someone with more knowledge of the code could probably find out if that is indeed the case pretty quickly :) (And thus fix it if it indeed is the case ;) )

[ben]

In 11211:

Fixes idle champion units not being found. Fixes #1188.
Adds trade class to merchant ship (for use in "find idle workers").
Explicitly adds females, traders/merchant ships, fishing boats, and healers to "find idle workers".
Fixes typos in fire ship template.