Sync Neutron requirements with upstream