Patches for check_swap providing inaccurate swap information on Sol6 [sf#1024735] [#330]