Merge pull request #2099 from fappels/3.6

Fix: Show sender Country on PDF docs
Revert "Update objectline_create.tpl.php"

This reverts commit fdac53bfca37b034a8decfb4f0e568cbc93a5b27.