Fix 'alembic branches' merge conflict as described by the web page.
........

Merged revisions 411191 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@411192 f38db490-d61c-443f-a65b-d21fe96a405b