cmake: update revision to 3.6.3 for release
cmake: updated revision to 3.6.4git post-release
Merge branch 'master' into next

Used merge strategy -s ours to skip over release commits