Merge "loader: Miscellaneous fixes."
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Fri, 19 Jan 2018 01:18:01 +0000 (19:18 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 19 Jan 2018 01:18:01 +0000 (19:18 -0600)

Trivial merge