Applying Thomas' patch from LANG-917 - fixing Arne Burmeister's reported exception when combining custom and choice formats

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1535547 13f79535-47bb-0310-9956-ffa450edef68