Description of problem:
1. firewalld cannot start after upgrade from 0.3.8-1 to 0.3.9-1
2. Afterwards, server is not accessible remotely.

Version-Release number of selected component (if applicable):
0.3.9-1

How reproducible:
100% 

Steps to Reproduce:
1. yum update, and firewalld is upgrade from 0.3.8-1 to 0.3.9-1 successfully.
2. ssh-telnet remotely failed.  Login console locally.
3. firewall-cmd --reload, error on __rule(), start code review.

Code review findings:
1. In src/firewall/core/fw_zone.py, line 344:
mark = self.__rule(enable, zone, args)
// Seems __rule() requires more argument.  Should it be mark = self.__rule(enable, zone, args, None)?
2. In config/xmlschema/zone.xsd:
<xs:attribute name="family" type="familyrestrict" use="required"/>
has been removed from sourcefamilytype/sourceaddresstype.  However, in src/firewall/core/rich.py, line 415:
function check(self) will check self.family and raise FirewallError(MISSING_FAMILY).  Is it a conflict?

Actual results:
Error: __rule() takes 5 arguments ...

Expected results:
Success

Additional info: