Merge changes Icf3df3aa,I92adad60

* changes:
  Add sEnableJavaBpfMap value to the dump
  Move CookieTag map dump to BpfNetMaps