Merge pull request #92 from daniellemayne/develop

Develop: bugzid 5413: set firewall, network, and subnet