Synchronize neutron.conf template with Havana again
Merge pull request #38 from vuntz/neutron.conf-sync

Synchronize neutron.conf template with Havana again