Final set of changes so that `make distcheck` works.
Merge branch 'master' of github.com:OpenLightingProject/ola