Merge /etc/default/jenkins with upstream changes (closes #18)