Minor fixes to firewall_aliases_edit

for 2.1  branch
Merge pull request #1294 from phil-davis/patch-19