Merge branch 'ff/java' of /var/lib/git/collectd into ff/java