fix empty COMMENT errors (upstream fix)

http://bugs.cacti.net/view.php?id=2379
fix COMMENT handling, even in case COMMENT is empty, with or without HR
and with variable substitution