HomePhorge

remerge refactor-kolabd (including recorded renames)