Fix imports to work with upstream master neutron