Added icinga::conf generic define for files #7273 - Includes #7264

This includes the Debian7 commits for the changes on the README.