Fixes issue with a failing test in DiscoResultTest
Merge branch 'master' of github.com:surevine/buddycloud-server-java