Added missing files to distribution tarball
Merge branch 'hotfix/6.1.7.2' into stable/6