Ultimate Equipment - Restore r21676 armor changes and update conditional load of UC gear to only include needed items.
Issue#: DATA-1332


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@21814 ef53c05b-3124-4d59-ae7d-fe3273f42be7