Merge "Remove redundant features: odl-adsal-controller-northbound and odl-nsf-control...