Merge branch 'cpack-deb-test-fixes' into release