Merge changes I6bffe1cd,I0984ba01

* changes:
  fs_mgr: split fstab parsing into separate file
  fs_mgr: update ext4_parse_sb to match change in ext4_utils