Merge pull request #4937 from bofferdn/bofferdn-avs-2

 Point to pdata which pulled in AVSBUS attributes