Merge "Add bit to eventlog to handle new network types" into jb-dev