Merge "Fixes to various issues reported by pyflakes"
authorJoshua Colp <jcolp@digium.com>
Thu, 22 Dec 2016 00:36:52 +0000 (18:36 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 22 Dec 2016 00:36:52 +0000 (18:36 -0600)

Trivial merge