Unified2xff v5

New version for the X-Forwarded-For support in Unified2 alerting. Created a new pull request due to having merged the master branch into the previous pull request. Addressed all of Victor comments.