Merge "core: Fix multiple trivial issues in the core."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Tue, 19 Dec 2017 20:46:02 +0000 (14:46 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 19 Dec 2017 20:46:02 +0000 (14:46 -0600)

Trivial merge