Merge changes Ifcf66d9e,I9709e3f6

* changes:
  Move DynamicPrivacyController from NSSL
  Move NotifEntryMan and NotifPipeline from NSSL