Merge changes Iffbd6261,Ic7382a61

* changes:
  fs_mgr: overlayfs: test: adding diagnostic value
  fs_mgr: overlayfs: test: skip apex mounts