build fixes
Merge branch 'release-4.6-unstable' of github.com:dhubler/sipxecs into release-4.6-unstable