Merge changes I809d8c2e,I11265375

* changes:
  fs_mgr: clean up dm ioctl flags
  init: refactor first stage to not require fstab