Fix for unit-tests
Merge branch 'good_old_merge' of ssh://github.com/NielsZeilemaker/tribler into good_old_merge
Fix for max_prefs
Pass alternate standins to connect_to_peercache