[matter] make sure to always account for built packages
[equo] fix "equo conf update" -7 discard option as per bug 3630