make sure that the shorewall package is installed before trying to change its configuration file (#3701)

Change-Id: Ib2dad30d53e5bf7539762eb3683430b10eb875ed
fix soledad-server not being available before the leap repository has been configured (#3702)

Change-Id: I8a86a241c52d88b4b681a800647d7c9c7c574b8e