XD-1589 support Groovy bean definition extensions
XD-1589 changes on merge