Patches for check_disk enhancements [sf#580423] [#138]