[CDF-238] - Reviewed build process for CDA master - some top level targe...

...ts were not correct