FL-742: merge logitechmediaserver-bin from squeezebox overlay. Remove local version. Also includes an unrelated rsync fix for merge.py.