Merge "Re-enable OSMLCM_VCA_CACERT"