Minor cleanups.
Merge topic 'cmake-packages-manual' into next

63497a9 Minor cleanups.