Clean merge with gradle-template

This includes the history of multi-project, which should make future merges cleaner.

In general there aren't any effective changes. This is just to keep the git history happy for future merges.