Merge "Fix broken tests caused by the fix on autohashing certificates (that results in double hashing)."