Merge changes I5e3f6677,I94665a41

* changes:
  fs_mgr: overlayfs create scratch using a Dynamic Logical Partition
  fs_mgr.h cleanup