Fixing Meta package to work
Adding last ros6 fixes to ensure we don't get divert conflicts.
Merge pull request #99 from ziggimon/ros6-update

Ros6 update

Tested in multiple scenarios.