Final set of changes to make `make distcheck` work.
Merge branch 'master' of github.com:OpenLightingProject/ola
Merge branch 'master' of github.com:OpenLightingProject/ola
More fixes so that `make distcheck` will work.