GPII-672: Updated all NP sets to be wrapped in the ontology in which they are declared
GPII-672: Spring cleanup before review/pull request