Port #548 to kinetic#595

Merged

mikeferguson merged 1 commit intokinetic-develfrom kinetic_548

Aug 1, 2017

+136-101

Commits on Jul 31, 2017

Fix CMakeLists + package.xmls (#548 )

mintar
authored and
mikeferguson
committed