Merge pull request #37 from chamankang/develop

fix fc007 and indentation problem
use the upstream linuxbridge_conf template

IptableFirewallDriver is now configured in the upstream template