Merge "Collect certificates when parsing APEX packages" into rvc-dev