Update packaging to support source package creation and upload
Fix so that use destination port even when matching on source address.
Allow for CIDRs that match all addresses.
Tweak CIDR fix for readability.
More readability fixes