Asan and UBsan clean
Style fix
Merge branch 'next' of github.com:maidsafe/MaidSafe-Drive into next