Merge "Fix for bug 5232736 Remove "DigiNotar Root CA""