asterisk-16.x: add fixes for AST-2019-006 and 007