Backport of svn 22814 and 22999 to fix CODE-2428
Issue#: CODE-2428


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/branches/6.02.x@23028 ef53c05b-3124-4d59-ae7d-fe3273f42be7