Merge changes Ibadd782d,I8704dccf into main

* changes:
  bpf: add constants PRIVATE, SHARED, MANDATORY, OPTIONAL
  switch from defines to static consts