Merge "BpfMap.h - simplify error returns" into main