upstream merge
fixes for icinga 1.9.x and version bump