Merge changes I90c8abad,I9ea0755f into main

* changes:
  Revert "Log bpf rc file if it differs from the template files."
  Revert "Fix BpfLoaderRcUtils to support IOS_8859_1"