Preparing for Lunar sync: 2018-09-28

Thanks @corot, In the meantime I opened https://github.com/ros/rosdistro/pull/19199.

I am planning to sync in about 12 hours. If you happen to have a fix by then I’ll happily merge it and hold the sync for another day