Fix for purging firewall rules and older fix that was backported for puppet 3.1 compat

Fix for purging firewall rules and older fix that was backported for puppet 3.1 compat

Includes tests that all pass