undo diffs in mod_basic
undo diffs in mod_voicemail_ivr
backport pull request #27