Work around for shorewall not being available at the site_config stage (#3339)

Change-Id: Id3138cb967f76380b7f4e22ce862a099cb47669e
Merge branch 'bug/3339' into develop