Merge pull request #955 from adrb/nsupdate_package

Nsupdate packages
Merge pull request #958 from jmaas/master

Merge pull request #955 from adrb/nsupdate_package