CMakeConfigurableFile: Remove excess newline.
Merge topic 'minor-cleanups' into next

e2f09aff CMakeConfigurableFile: Remove excess newline.