Small code tidy
Merge branch 'master' of github.com:buddycloud/buddycloud-server-java