Add nhrp packages to packagelist
Merge remote-tracking branch 'upstream/helium' into helium