Add missing commit -- manage asterisk.conf file
Simplify and clarify conditionals