Merge changes from topic "cbpf"

* changes:
  clat: switch to relative cbpf filter
  clatutils - code cleanup