Moving more properties into gradle-plugin.properites file and associated class changes.