Fix test in solaris to detect the free memory
Merge branch 'molly' into solaris