Fixes for server header#98

Natrinicle wants to merge 3 commits intopuppetlabs:mainpuppetlabs/puppetlabs-rsync:mainfrom

Natrinicle:server_headerNatrinicle/puppetlabs-rsync:server_headerCopy head branch name to clipboard