Merge "Skip testProcSwapsTest if /proc/swaps file is not present"