add groovy for elasticsearch testing
Merge branch 'upgrade-infrastructure' into docker