Merge changes Id338f439,Ic7f50453 into main

* changes:
  bootstat: avoid vector<const T>
  fs_mgr: avoid vector<const T>