Merge remote-tracking branch 'upstream/LroLidar_Infrastructure' into LroLidar_Infrastructure