Fixes to reflect changes in pcl-1.7

This should be merged in for `hydro`, because these changes are only for pcl-1.7.