Merge "Create odl-nsf-service feature, which excludes neutron feature"