Maid 195 make filesystem test pass over linux

https://maidsafe.atlassian.net/browse/MAID-195
http://dash.maidsafe.net/buildSummary.php?buildid=59362

The previous pull request
https://github.com/maidsafe/MaidSafe-Drive/pull/22 
is also included