Improvements in package build.
Merge pull request #2197 from asmorkalov:ocv_packaging2