Merge "Fix cargo2rulesmk.py handling of optional deps" into main