Merge pull request #10615 from danudey/update-release-packaging-scripts-master