Formatting fixups
Fix for use in VPAW 2
Removed policy unknown to oldest support CMake version
Merge branch 'slicer_changes'