Added license headers and update manifests
Merge branch 'master' into groovy-devel