KAZOO-2839: updates to match upstream changes
Merge pull request #542 from 2600hz/KAZOO-2839

KAZOO-2839: updates to match upstream changes