Merged changes from trunk into branch (there were not many).

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/beanutils/branches/java5@1540184 13f79535-47bb-0310-9956-ffa450edef68