Merge "Fix cpack src ignore rule" into release-4-6