Merge trunk changes into beta2 branch

git-svn-id: https://svn.apache.org/repos/asf/jakarta/bsf/branches/bsf-3.0-beta2@591073 13f79535-47bb-0310-9956-ffa450edef68
10 files changed