[ros-diffs] [hbelusca] 66771: Sync with trunk r66770. Fix whitespace in pnp.c