Patches for check_swap fix for more than 4GB of swap [sf#868900] [#320]