Merge "[CLI] Simplify cert retrieval script"