BsFileSystemHelper: Merged all changes and fixes

* merged all changes and fixes from master

Change-Id: I9537c7bfd1567c3782c7d6bdb16024d998719653