Switch external Neutron module back to master branch and pull in (own) patch