Merge "move convenience methods from BpfMap to IBpfMap" into main