Merge changes I8b5e08a3,Iccfe06f9

* changes:
  fs_mgr_overlayfs: Remove support for physical scratch
  fs_mgr_overlayfs: Refactor scratch mounting code