Merge changes from topic 'PackageRefactor'

* changes:
  Change package in prh-aai-client
  Change package in prh-dmaap-client module