Removed superfluos firewall rules removal, better management of  firewall lock
Merge pull request #152 from Zentyal/jag/captive-firewall-rules

 Removed superfluos firewall rules removal, better management of  firewa...