Merge branch 'livestatus_full_generator' into branch-1.4