Merge topic 'fix-new-policy-versions'

07c16ee Update version introducing CMP0021, CMP0022, and CMP0023
Merge branch 'master' into next