Merge "rootdir: access to pstore denied to bootstat"