Move configuration file to groovy based config
Merge remote-tracking branch 'origin/master'