Re-added OTRSKeepFAQAttachments Merged packages.

FAQ is not able to manage the removal of the package during upgrade due to a file conflict.

-Tidied file.