Merge "Fixes neutron patch to only apply when ODL + FDIO" into stable/danube