Merge "Allow command-line options to override asterisk.conf."