Merge "Enabling helm3 & kubernetes 1.18 for RIC"