Being more general about java dependencies
Merge branch 'master' of https://github.com/buddycloud/buddycloud-package