Fixed root diskspace parsing error (OMS-603)
Merged changes