Merge "Monitor the firewall rules file for changes" into jb-mr2-dev