Merge "Fix VNF/PNF package integrity issue with CMS signature not containing certificate"