Multiarch Fixes - ros-catkin-lint

No unpublished successful runs for ros-catkin-lint.