prepare next build; use beanshell2, fix missing files from 4.1 branch - enables all Macro languages back

git-svn-id: file:///srv/repos/svn-packages/svn@204593 eb2447ed-0c53-47e4-bac8-5bc4a241df78