cleaning up package.xml and adding maintainers
Merge branch 'master' into devel