Merge "add more checkes for too small disk space" into jb-mr2-dev