Merge "Update cpe for vulnerability scanners"