Fix headers

This pull request combines two previous ones which are still pending (waiting for feedback from Goobi e.V. management). It adds a new patch which is needed because new files with the invalid FSF address were added recently.

Please consider pulling all three patches soon.

Regards
Stefan