Merge changes I9be69af5,Ib85ee393 into rvc-dev

* changes:
  Clear uninstall block when removing DO.
  Clean up app restrictions when removing DO or PO