Merge changes I5d66c2b2,Ic11952e0 into rvc-qpr-dev

* changes:
  RESTRICT AUTOMERGE Handling removing <original-package> tag
  RESTRICT AUTOMERGE Revert "Handling removing <original-package> tag"