o Remove a subtype of <includefile/> to reduce feature bloat
o Select 32 bit subnet (host) as a suggestion
o Never skip LAN and make it optional instead
o Fix regression of $xml passing
o Fix voodoo on Static

(cherry picked from commit 62e7fd28)