Merge pull request #1 from pamval/master

Fixes for CDF-238 and CDF-242
Merge pull request #2 from pamval/master

[CDF-238] - Reviewed build process for CDV
Merge pull request #3 from pamval/master

[CDF-238] - Reviewed build process for CDV
Fixes for 5.0 and 4.8