Fix server-id and add transfer-source#113

jwschot wants to merge 3 commits intothias:masterthias/puppet-bind:masterfrom

jwschot:masterjwschot/puppet-bind:masterCopy head branch name to clipboard