Revert "Revert "pep8 cleanup for icinga files""

Nothing to see here... I reverted so I could recommit when I'm
around for the next round of puppet runs.

This reverts commit 5c103fe23689bea836f6697d8f30856b743feb33.

Change-Id: Id4f9621a925b52f3305cfe272ad0e61889e7fc22
Merge "Revert "Revert "pep8 cleanup for icinga files""" into production