Tweaks to the use of HttT portrait variations.
Merge branch 'master' of https://github.com/wesnoth/wesnoth-old