Merge change 9075 into donut

* changes:
  Change the resource path for fwd locked apps when scanning the fwd locked install directory