Updated to match changes to FindCbfs module.
Merge remote-tracking branch 'origin/next' into installer_update
Merge remote-tracking branch 'origin/next' into installer_update
Merge branch 'installer_update' of github.com:maidsafe/Client into installer_update