Merge "Doc update: Fix firewall text." into jb-mr1.1-docs