Various fixes for Neutron importation.

Change-Id: Iede9ad171157bd8443ccfee7877155131b74f7ce
Signed-off-by: Brandon Berg <bberg@midokura.com>