Caught some changes that didn't get uploaded to SVN; hope I got them all.
Issue#: DATA-910


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