Merge "Remove references to the neutron:server:plugin parameter"