fix locale conf setting dropdown (RT#21054)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
add domain and locale options to command-line phone number list, RT#21054
add domain and locale options to command-line phone number list, RT#21054