firewall: Support firewalld 2.x

firewalld 2.1.0 is now in Debian testing.

• Check what are the changes from 1.3.3 to 2.x.
• Handle updates to the configuration file as needed.
• Modify force_upgrade to support automatic upgrade to 2.x versions.